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

xieb

2023-07-12 8aa4448ea65b5ef86689bd15c6b895afc99d17d0

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolRecord.java

@@ -75,4 +75,16 @@
    */
   private String solution;


   /**
    * 处理状态(1、已解决，2、未解决)
    */
   @ApiModelProperty("处理状态(1、已解决，2、未解决)")
   private String state;

   /**
    * 工作流任务id
    */
   @ApiModelProperty("工作流任务id")
   private String flowTaskId;
}