From 2e9c442b4961dc30423e8b8fa1361c45e63ef620 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 16 八月 2023 19:52:00 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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..f9bd453 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
@@ -1,6 +1,5 @@
package com.ruoyi.shop.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,7 +19,7 @@
@ApiModelProperty(value = "商户id")
private Long shopId;
- @ApiModelProperty("商户状态0冻结1正常2终止合作")
+ @ApiModelProperty(value="商户状态0冻结1正常2终止合作")
private Integer shopStatus;
@ApiModelProperty(value = "商户名称")
@@ -29,14 +28,14 @@
@ApiModelProperty(value = "商户地址")
private String shopAddress;
- @ApiModelProperty("店主姓名")
+ @ApiModelProperty(value="店主姓名")
private String shopownerName;
- @ApiModelProperty("店主联系方式")
+ @ApiModelProperty(value="店主联系方式")
private String shopownerPhone;
- @ApiModelProperty("合作期限")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value="合作期限")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date cooperationEndTime;
--
Gitblit v1.7.1