Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 726c2e196bac6e56f588736c68b07a933dabb127

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

@@ -80,5 +80,5 @@
     * @param userType 用户类型
     * @return 结果
     */
    List<SysUser>  queryList(@Param("userType") Integer userType);
    List<SysUser>  queryList(@Param("userType") Integer userType,String keyWord);
}