Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2024-01-15 f6569368640f0c0adf9b7e5955b9e7af5ff3efba

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java

@@ -113,7 +113,7 @@

   @Override
   @Transactional(rollbackFor = Exception.class)
   public boolean startProcess(PatrolTask patrolTask) {
   public PatrolTask startProcess(PatrolTask patrolTask) {
      String businessTable = FlowUtil.getBusinessTable(ProcessConstant.PATROL_KEY);
      if (Func.isEmpty(patrolTask.getId())) {
         save(patrolTask);
@@ -133,7 +133,7 @@
      } else {
         updateById(patrolTask);
      }
      return true;
      return patrolTask;
   }

   @Override