Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-09 dc0285dcb1695f8f7b69b09bc6dcd4e3e9ba4173

 flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java

@@ -18,7 +18,7 @@
    }

    @Override
    public HuaChengSysUser selectData(String userId,String account,String phone) {
    public List<HuaChengSysUser> selectData(String userId,String account,String phone) {
        return baseMapper.selectData(userId,account,phone);
    }