From b7c94458ce1c37cfc1b8797ebc38a9a03e305b1f Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 17 八月 2023 18:33:32 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java |    3 ++-
 1 files changed, 2 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..3f07c7e 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
@@ -38,5 +38,6 @@
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date cooperationEndTime;
 
-
+    @ApiModelProperty(value="合作状态0终止1开启")
+    private Integer cooperativeFlag;
 }

--
Gitblit v1.7.1