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

zhanghua

2022-10-28 899e021604c2dc1660fe9b240f041f7bef56563b

 ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java

@@ -25,4 +25,5 @@

    Page<UmsAdmin> selectCondPage(@Param("page") Page<UmsAdmin> page, @Param("umsAdmin") UserVO.PageUserVO pageUserVO);

    Page<UmsAdmin> selectPageByWordKey(Page<UmsAdmin> page, @Param("keyword") String keyword);
}