From f26537e926d7ad2d725e059700142ba14c0c2b1f Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 12 七月 2023 21:04:27 +0800
Subject: [PATCH] 定时任务延时任务

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 7eb393c..a34d173 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
@@ -20,7 +20,7 @@
     @ApiModelProperty(value = "商户id")
     private Long shopId;
 
-    @ApiModelProperty("商户状态0冻结1正常2终止合作")
+    @ApiModelProperty(value="商户状态0冻结1正常2终止合作")
     private Integer shopStatus;
 
     @ApiModelProperty(value = "商户名称")
@@ -29,13 +29,13 @@
     @ApiModelProperty(value = "商户地址")
     private String shopAddress;
 
-    @ApiModelProperty("店主姓名")
+    @ApiModelProperty(value="店主姓名")
     private String shopownerName;
 
-    @ApiModelProperty("店主联系方式")
+    @ApiModelProperty(value="店主联系方式")
     private String shopownerPhone;
 
-    @ApiModelProperty("合作期限")
+    @ApiModelProperty(value="合作期限")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date cooperationEndTime;
 

--
Gitblit v1.7.1