From e522e4d40451b4e46ec79b3d8a3891899196f14f Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 19 Jun 2021 14:45:17 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 fe414cc..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
@@ -3,11 +3,9 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.anotations.Extend;
import com.matrix.core.tools.DateUtil;
-import com.matrix.system.app.dto.BasePageDto;
import com.matrix.system.common.bean.EntityDTOExt;
import org.springframework.format.annotation.DateTimeFormat;
-import java.io.Serializable;
import java.util.Date;
/**
*
@@ -230,6 +228,7 @@
* 开始时间
*/
@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date beginTime;
@@ -237,6 +236,7 @@
* 结束时间
*/
@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date endTime;
@@ -251,6 +251,19 @@
private String cateName;
+ /**
+ * 业绩规则名称
+ */
+ private String achieveRuleName;
+
+ public String getAchieveRuleName() {
+ return achieveRuleName;
+ }
+
+ public void setAchieveRuleName(String achieveRuleName) {
+ this.achieveRuleName = achieveRuleName;
+ }
+
public Double getCardCash() {
return cardCash;
}
--
Gitblit v1.9.1