From 65ca63cc3d36f23d285a7d944fcc0d6bac92430d Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 18 三月 2024 14:41:42 +0800 Subject: [PATCH] 合并代码 --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java | 8 +++++--- 1 files changed, 5 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..0e9959d 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; @@ -94,6 +98,4 @@ @ApiModelProperty(value = "商铺id") private Integer shopId; - @ApiModelProperty(value = "多个用户的id") - private List<Long> ids; } -- Gitblit v1.7.1