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

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/excel/UserExcel.java

@@ -94,4 +94,8 @@
   @ExcelProperty("生日")
   private Date birthday;

   @ColumnWidth(20)
   @ExcelProperty("类型(堤防/水库)")
   private String type;

}