From 8059e9b991c15edbac508e6b658a0d9571d11b1c Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 01 八月 2025 12:46:00 +0800
Subject: [PATCH] bug修改

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java
index f9bd453..c1f5a9e 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java
@@ -22,6 +22,9 @@
     @ApiModelProperty(value="商户状态0冻结1正常2终止合作")
     private Integer shopStatus;
 
+    @ApiModelProperty(value = "商户图片")
+    private String shopPicture;
+
     @ApiModelProperty(value = "商户名称")
     private String shopName;
 
@@ -38,5 +41,6 @@
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date cooperationEndTime;
 
-
+    @ApiModelProperty(value="合作状态0终止1开启")
+    private Integer cooperativeFlag;
 }

--
Gitblit v1.7.1