From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期五, 04 七月 2025 20:39:58 +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 | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 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 e6ab8b7..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 @@ -52,12 +52,16 @@ @ApiModelProperty(value = "推荐人") private String recommendPerson; + @ApiModelProperty(value = "部门id") + private Long deptId; + @ApiModelProperty(value = "归属员工") private Long belongUserId; @ApiModelProperty(value = "归属经销商id") private Long belongShopId; - + @ApiModelProperty(value = "归属员工ids") + private List<Long> belongUserIds; @ApiModelProperty(value = "来源渠道") private String shopSource; @@ -93,7 +97,8 @@ @ApiModelProperty(value = "商铺id") private Integer shopId; + + @ApiModelProperty(value = "关联账户id,多个用逗号分隔") + private String associatedAccount; - @ApiModelProperty(value = "多个用户的id") - private List<Long> ids; } -- Gitblit v1.7.1