From 0af329d7210a84c97ec071735a2d0d1d7b0b785c Mon Sep 17 00:00:00 2001 From: zhanglin8526 <852614290@qq.com> Date: 星期六, 26 八月 2023 13:58:48 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java | 7 +++---- 1 files changed, 3 insertions(+), 4 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 4eb2160..8638fe9 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,8 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.List; - /** * @author jqs34 * @ClassName MgtShopPageDto @@ -55,6 +53,9 @@ @ApiModelProperty(value = "归属员工") private Long belongUserId; + @ApiModelProperty(value = "归属经销商id") + private Long belongShopId; + @ApiModelProperty(value = "来源渠道") private String shopSource; @@ -91,6 +92,4 @@ @ApiModelProperty(value = "商铺id") private Integer shopId; - @ApiModelProperty(value = "多个用户的id") - private List<Long> ids; } -- Gitblit v1.7.1