Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 5ccc656f6ed10aaf14b662c3392b07e99b9016e0

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