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

ke

2024-12-03 bfe4e6e49ea341c8443d7b4b70cb66de0f1aadab

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

@@ -55,7 +55,11 @@

   List<SgAllDeptOrUser> queryUser();

   List<SgProjectTreeVO> projectTree();
   List<SgProjectTreeVO> projectTree(@Param("dto") ProjectSearchDTO dto);

    List<String> getUserS(@Param("list") List<String> controlUnit);

   List<ResVO> resList(IPage<ResVO> page, @Param("dto") ProjectSearchDTO dto);


   //List<String> getProjectIds(String code,@Param("grad") String grad );