From 23802c625b4f78dbd30db82d1b9e5a839b4071c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 16:41:54 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerEvaluateVO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerEvaluateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerEvaluateVO.java
index 744f56d..b8a9d9c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerEvaluateVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerEvaluateVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.shop;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -46,12 +47,13 @@
* 评价时间
*/
@ApiModelProperty("评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date evaluateTime;
/**
- * 评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)
+ * 评价类型(5.非常满意 4.满意 3.一般 3.不满意 1.糟糕透了)
*/
- @ApiModelProperty("评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)")
+ @ApiModelProperty("评价类型(5.非常满意 4.满意 3.一般 3.不满意 1.糟糕透了)")
private Integer evaluateType;
/**
--
Gitblit v1.7.1