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

zhanghua

2023-10-23 1295c58e706a74ad68d3c2c84b2bdde779507fb5

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

}