From df1b14344ba81cab80ddd118a12289d95f69e4a3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 17 Dec 2020 21:45:02 +0800
Subject: [PATCH] modify vip_detail.html
---
zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 b768fbb..cb92933 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
@@ -2,7 +2,7 @@
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;
@@ -200,6 +200,8 @@
private String day;
+ private String vipQueryKey;
+
/**
* 订单编号
@@ -233,14 +235,14 @@
/**
* 开始时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date beginTime;
/**
* 结束时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date endTime;
@@ -250,6 +252,13 @@
@Extend
private Double achieveMoney;
+ public String getVipQueryKey() {
+ return vipQueryKey;
+ }
+
+ public void setVipQueryKey(String vipQueryKey) {
+ this.vipQueryKey = vipQueryKey;
+ }
public Long getCompanyId() {
return companyId;
--
Gitblit v1.9.1