From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 10:31:30 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/OauthUserVo.java |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 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 6189511..50e9f61 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
@@ -5,19 +5,25 @@
 
 @Data
 public class OauthUserVo {
-
-    @ApiModelProperty("商户id")
+    
+    @ApiModelProperty(value = "商户id")
     private Long shopId;
-
-    @ApiModelProperty("成员UserID")
+    
+    @ApiModelProperty(value = "商户数量")
+    private Integer shopNum;
+    
+    @ApiModelProperty(value = "商户名称")
+    private String shopName;
+    
+    @ApiModelProperty(value = "成员UserID")
     private String userid;
-
-    @ApiModelProperty("手机")
+    
+    @ApiModelProperty(value = "手机")
     private String mobile;
-
-    @ApiModelProperty("token凭证")
+    
+    @ApiModelProperty(value = "token凭证")
     private String token;
-
-    @ApiModelProperty("过期时间")
+    
+    @ApiModelProperty(value = "过期时间")
     private Long expiresIn;
 }

--
Gitblit v1.7.1