Merge branch 'lyl-dev'

17808

2023-09-13 c99438c64037b06c629e37f1f1acb5ce48a31036

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

}