From b95715d5cdc806cbb15cc7f49c538e61f5ab5dc6 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:31:46 +0800
Subject: [PATCH] bug和二维码
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java | 10 ++++++----
1 files changed, 6 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 fbb6498..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
@@ -1,6 +1,7 @@
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;
@@ -19,7 +20,7 @@
@ApiModelProperty(value = "商户id")
private Long shopId;
- @ApiModelProperty("商户状态0冻结1正常2终止合作")
+ @ApiModelProperty(value="商户状态0冻结1正常2终止合作")
private Integer shopStatus;
@ApiModelProperty(value = "商户名称")
@@ -28,13 +29,14 @@
@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