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/vo/MgtShopProportionPageVo.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopProportionPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopProportionPageVo.java
index 070f4ab..b7e8ca8 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopProportionPageVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopProportionPageVo.java
@@ -21,13 +21,13 @@
@ApiModelProperty(value = "商户id")
private Long shopId;
- @ApiModelProperty("商户名称")
+ @ApiModelProperty(value="商户名称")
private String shopName;
- @ApiModelProperty("店铺地址")
+ @ApiModelProperty(value="店铺地址")
private String shopAddress;
- @ApiModelProperty("店主姓名")
+ @ApiModelProperty(value="店主姓名")
private String shopownerName;
@ApiModelProperty(value = "分成比例")
--
Gitblit v1.7.1