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/IPatrolTaskService.java

@@ -57,7 +57,7 @@
    * @param patrolTask 任务实体
    * @return boolean
    */
   boolean startProcess(PatrolTask patrolTask);
   PatrolTask startProcess(PatrolTask patrolTask);

   boolean patrolCompleteTask(PatrolTaskVO patrolTaskVO,String currentUserId,String taskUser);