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

zhongrj

2023-04-24 684d583978a4f0d4b0bd88ad46ad2f6238d185c8

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java

@@ -31,4 +31,9 @@
    * 角色名
    */
   private String roleName;

   /**
    * 当前用户id
    */
   private String currentUserId;
}