From 0af329d7210a84c97ec071735a2d0d1d7b0b785c Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 13:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppSuggestPageVo.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppSuggestPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppSuggestPageVo.java
index b3dfea8..bb9ce6e 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppSuggestPageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppSuggestPageVo.java
@@ -1,6 +1,6 @@
package com.ruoyi.member.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,11 +22,14 @@
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 回复内容
*/
- @ApiModelProperty(value = "回复内容")
+ @ApiModelProperty(value = "平台回复内容")
private String replayContent;
+ @ApiModelProperty(value = "商户回复内容")
+ private String shopReplayContent;
}
--
Gitblit v1.7.1