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

xieb

2024-12-02 9f204e8842e1688858889a67b702d9e19bb18b15

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.java

@@ -46,4 +46,6 @@
   List<Map<String, Object>> getRoleByIds(@Param("ids")List<Long> rids);

   List<Long> getSgEngineerRole();

   List<Map<String, Object>> getUserByIdsCounty(@Param("ids") List<Long> ids);
}