From 9658e5ca43e617c68c54d7dd7797f873e55311c3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 21:26:39 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/OauthUserVo.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/OauthUserVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/OauthUserVo.java
index 7e26e9d..6189511 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/OauthUserVo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/OauthUserVo.java
@@ -6,6 +6,9 @@
 @Data
 public class OauthUserVo {
 
+    @ApiModelProperty("商户id")
+    private Long shopId;
+
     @ApiModelProperty("成员UserID")
     private String userid;
 
@@ -13,7 +16,7 @@
     private String mobile;
 
     @ApiModelProperty("token凭证")
-    private String accessToken;
+    private String token;
 
     @ApiModelProperty("过期时间")
     private Long expiresIn;

--
Gitblit v1.7.1