Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-09-21 2193f1e8240e2a0ed5900dddc6347a1d9db081cf

 server/service/src/main/java/com/doumee/service/system/SystemUserService.java

@@ -70,7 +70,7 @@
     * @date 2023/03/21 14:49
     */
    List<SystemUser> findList(SystemUser systemUser);
  

    /**
     * 分页查询
     * @author Eva.Caesar Liu
@@ -80,6 +80,9 @@

    PageData<SystemUser> findAllList(PageWrap<SystemUser> pageWrap);


    List<SystemUser> findAllList(SystemUser pageWrap);

    /**
     * 条件统计
     * @author Eva.Caesar Liu