Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!289

src/main/java/cn/timer/api/controller/kqgl/service/KqglServiceImpl.java

@@ -842,11 +842,11 @@ public class KqglServiceImpl implements KqglService {
 		    	}
 			}else if(attgro.getPbfs() == 2){//自由排班
 				//未排班时,员工可选择班次打卡
-			    if(attgro.getIsXzbcdk() == 1){
-			    	attcar.setOptscheduling(true);	
-			    }else{
-			    	attcar.setOptscheduling(false);
-			    }
+//			    if(attgro.getIsXzbcdk() == 1){
+//			    	attcar.setOptscheduling(true);	
+//			    }else{
+//			    	attcar.setOptscheduling(false);
+//			    }
 				if(jrpb != null){
 					if(jrpb.getBcid() != 0){//有班次时("Bcid"不为0时)
 						KqglAssoBcsz tsrq = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, jrpb.getBcid()));