From 2f38b2341e1572502fd6b4510670107f57ed261c Mon Sep 17 00:00:00 2001 From: jiangqs <343695869@qq.com> Date: 星期五, 18 八月 2023 23:05:34 +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 | 3 ++- 1 files changed, 2 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 5964b16..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 @@ -89,6 +89,7 @@ @ApiModelProperty(value = "与合作商关系1.好2.差") private Integer relationPartner; - + @ApiModelProperty(value = "商铺id") + private Integer shopId; } -- Gitblit v1.7.1