From e423d56d730db1baed24f3f7dbbc4141038776b6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Jun 2021 22:12:03 +0800
Subject: [PATCH] 修复每日业绩bug和优化赠送业绩计算方式

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
index 0c313f0..ff883d8 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
@@ -228,6 +228,7 @@
 	 * 开始时间
 	 */
 	@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	private Date  beginTime;
 			
 	
@@ -235,6 +236,7 @@
 	 * 结束时间
 	 */
 	@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	private Date  endTime;
 
 

--
Gitblit v1.9.1