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

yanghui

2022-12-06 d46e0bd3cfb8f7c605e9a602996007aa37b52b79

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