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

aix

2024-08-28 f142d48409503dfd6b11d7d414c0ee7ffa85eed5

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgReportUserDO.java

@@ -65,4 +65,8 @@
   private Integer isHis;
   @TableField(exist = false)
   private String userName;

   @TableField(exist = false)
   private String deptName;

}