From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java
index 497f0ec..2729107 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* @author jqs34
* @ClassName MgtShopPageDto
@@ -58,7 +60,8 @@
@ApiModelProperty(value = "归属经销商id")
private Long belongShopId;
-
+ @ApiModelProperty(value = "归属员工ids")
+ private List<Long> belongUserIds;
@ApiModelProperty(value = "来源渠道")
private String shopSource;
@@ -94,5 +97,8 @@
@ApiModelProperty(value = "商铺id")
private Integer shopId;
+
+ @ApiModelProperty(value = "关联账户id，多个用逗号分隔")
+ private String associatedAccount;
}
--
Gitblit v1.7.1