Merge remote-tracking branch 'origin/master'

baizonghao

2023-03-18 42cce7d9a859083818a0e10eb3b6c80385042e47

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

}