Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-15 5f6cb2554447c1103147675789effec004e28049

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

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