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

lidongdong

2022-10-21 087cdd047c26b4dba4efc61c8f873b3afcb552d4

 flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java

@@ -26,7 +26,9 @@
     *
     * @return 参数配置信息
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,@Param("userType") String userType);
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
                                          @Param("userType") String userType,
                                          @Param("userName") String userName);



@@ -63,7 +65,7 @@
     *
     * @return 结果
     */
    public int selectNum(String userType);
    public int selectNum(@Param("userType") String userType,@Param("userName") String userName);

    /**
     * 根据部门id及分类id获取导办用户