Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 726c2e196bac6e56f588736c68b07a933dabb127

 flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java

@@ -54,12 +54,14 @@
            }

            HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(currentUserId+"","","");
            sysUser=userService.selectData(null,huaChengSysUser.getPhone());
            if(sysUser!=null)
            if(huaChengSysUser!=null)
            {
                return sysUser;
                sysUser=userService.selectData(null,huaChengSysUser.getPhone());
                if(sysUser!=null)
                {
                    return sysUser;
                }
            }

        }
        return null;
//        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);