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

yanghui

2022-10-21 5f3cf501f9f6c216df17ee8af6618b55b537d21a

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