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

aix

2024-08-28 f142d48409503dfd6b11d7d414c0ee7ffa85eed5

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

@@ -1,6 +1,5 @@
package cn.gistack.sm.sg.mapper;

import cn.gistack.sm.sg.DO.SgGxStepDO;
import cn.gistack.sm.sg.DO.SgProjectInfoDO;
import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
import cn.gistack.sm.sg.VO.*;
@@ -52,5 +51,10 @@

   List<SgStatisDeviceVO> getDeviceTypes(@Param("s") String s);

   List<SgAllDeptOrUser> queryDept();

   List<SgAllDeptOrUser> queryUser();


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