Merge remote-tracking branch 'origin/master'

fuliqi

2023-12-18 acea9131318ee6823d008b386e52fee573882b2e

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

}