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

lidongdong

2022-10-21 7c91dfbf9a20e9be807a359736b0c7a741d640ba

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

@@ -245,8 +245,8 @@
    }

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