From 3868b706ee3ee115a400d77abc3b69b83ea448c7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 03 Sep 2021 14:15:36 +0800
Subject: [PATCH] bug123
---
zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 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..8f498a0 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;
/**
*
@@ -194,6 +192,8 @@
private String vipQueryKey;
+ private Long achieveRuleId;
+
/**
* 订单编号
@@ -230,6 +230,7 @@
* 开始时间
*/
@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date beginTime;
@@ -237,6 +238,7 @@
* 结束时间
*/
@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date endTime;
@@ -250,6 +252,19 @@
private String payMethod;
private String cateName;
+
+ /**
+ * 业绩规则名称
+ */
+ private String achieveRuleName;
+
+ public String getAchieveRuleName() {
+ return achieveRuleName;
+ }
+
+ public void setAchieveRuleName(String achieveRuleName) {
+ this.achieveRuleName = achieveRuleName;
+ }
public Double getCardCash() {
return cardCash;
@@ -528,6 +543,13 @@
this.day = day;
}
+ public Long getAchieveRuleId() {
+ return achieveRuleId;
+ }
+
+ public void setAchieveRuleId(Long achieveRuleId) {
+ this.achieveRuleId = achieveRuleId;
+ }
public String getOrderNo() {
return orderNo;
--
Gitblit v1.9.1