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

yanghui

2022-11-10 ec96abc7c3d9ef48b00c321eed85f9d934c699a5

 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);
}