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

ke

2024-04-18 f2d0713c2b20a6c751399e2468996eafb8812988

 skjcmanager/skjcmanager-service-api/skjcmanager-user-api/src/main/java/cn/gistack/system/user/entity/User.java

@@ -98,4 +98,7 @@
   private String maced;
   private String encdata;

   //水库或是堤防用户标识
   private String type;

}