Merge remote-tracking branch 'origin/master'

xiejun

2023-08-24 4c32b9bf0ccba92eaa34ac5a376a5d3ceddb7484

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java

@@ -20,8 +20,12 @@
@Slf4j
public class DockingApplyGroupCodeSyncScheduling {

   @Resource
   private IGroupCodeDuckingSyncService groupCodeDuckingSyncService;
<<<<<<< HEAD
   //@Resource
=======
// @Resource
>>>>>>> c31b334ae86c8c6240bed10c633513685322d052
   //private IGroupCodeDuckingSyncService groupCodeDuckingSyncService;

   @Value("${apply.groupCode.isStart:false}")
   public boolean APPLY_GRUPCODE_SYNC_ISSTARE;