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

ke

2024-11-26 b672cafe6a447c9b19691b583df9542ad84bce2c

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

@@ -42,4 +42,10 @@
   Long selectProframId(Long deviceId);

   List<SgReportUserDO> selectProcessUserByProjectId(@Param("programId") Long programId);

   List<Map<String, Object>> getRoleByIds(@Param("ids")List<Long> rids);

   List<Long> getSgEngineerRole();

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