Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-10-26 8669da14a12a3e9a8a7ae720cf65798cb2751e73

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