From a966dafb8877552267a94fe8c544c5ea72cf5650 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 16 六月 2025 09:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/OauthUserVo.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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..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,16 +5,25 @@
@Data
public class OauthUserVo {
-
- @ApiModelProperty("成员UserID")
+
+ @ApiModelProperty(value = "商户id")
+ private Long shopId;
+
+ @ApiModelProperty(value = "商户数量")
+ private Integer shopNum;
+
+ @ApiModelProperty(value = "商户名称")
+ private String shopName;
+
+ @ApiModelProperty(value = "成员UserID")
private String userid;
-
- @ApiModelProperty("手机")
+
+ @ApiModelProperty(value = "手机")
private String mobile;
-
- @ApiModelProperty("token凭证")
- private String accessToken;
-
- @ApiModelProperty("过期时间")
+
+ @ApiModelProperty(value = "token凭证")
+ private String token;
+
+ @ApiModelProperty(value = "过期时间")
private Long expiresIn;
}
--
Gitblit v1.7.1