From 5fa7b7c30f993666518cd409c76a8bcc683655d0 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 11:31:12 +0800
Subject: [PATCH] 1、修改点赞bug
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
index e668ea8..dd76b14 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
@@ -1,7 +1,8 @@
package com.matrix.system.hive.bean;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.anotations.Extend;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -36,6 +37,7 @@
/**
* 订单创建时间
*/
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date createTime;
/**
@@ -154,7 +156,7 @@
/**
* 预约时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date yyTime;
/**
@@ -170,12 +172,12 @@
/**
* 开始时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date startTime;
/**
* 结束时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date endTime;
/**
* 超时时间
@@ -230,6 +232,14 @@
* 床位名称
*/
private String bedName;
+ /**
+ * 评价
+ */
+ private String comment;
+ /**
+ * 评价回复
+ */
+ private String reply;
/**
* 商机
*/
@@ -239,6 +249,8 @@
* 服务预计时长
*/
private Integer totalTime;
+
+
@@ -253,6 +265,22 @@
* 门店
*/
private SysShopInfo shopInfo;
+
+ public String getComment() {
+ return comment;
+ }
+
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
+
+ public String getReply() {
+ return reply;
+ }
+
+ public void setReply(String reply) {
+ this.reply = reply;
+ }
@Extend
private String shopName;
@@ -287,13 +315,15 @@
/**
* 扩展属性-预约查询开始时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date beginTime;
/**
* 扩展属性-预约查询结束时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date closureTime;
/**
--
Gitblit v1.9.1