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

zhanghua

2023-10-26 8c80a8d7d70d0aa19fe194df49c21a88d2ba7589

 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);

}