Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-15 d7c3b9d46cc331cfc57446d77c44e4c138addd72

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

@@ -250,8 +250,8 @@
    }

    @Override
    public SysUser selectData(String userId) {
        return baseMapper.selectData(userId);
    public SysUser selectData(String userId,String phonenumber) {
        return baseMapper.selectData(userId,phonenumber);
    }