Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2023-11-29 704e7207d74b6477c5f472c5aba92d484ab17f98

 ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java

@@ -25,4 +25,7 @@
    List<UmsAdmin> selectSurplusUser();

    List<UmsAdmin> selectSurplusUserAndExistUser(@Param("id") Long id);

    String getDepartType(Integer id);

}