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/domain/vo/ShopRelUserVo.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ShopRelUserVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ShopRelUserVo.java
index da70ce0..4535120 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ShopRelUserVo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ShopRelUserVo.java
@@ -5,10 +5,16 @@
@Data
public class ShopRelUserVo {
-
- @ApiModelProperty(value="商户id")
+
+ @ApiModelProperty(value = "商户id")
private Long shopId;
-
- @ApiModelProperty(value="用户姓名")
+
+ @ApiModelProperty(value = "商户数量")
+ private Integer shopNum;
+
+ @ApiModelProperty(value = "商户名称")
+ private String shopName;
+
+ @ApiModelProperty(value = "用户姓名")
private String userName;
}
--
Gitblit v1.7.1