From 8eda088db63ff198cbcd51bf0599531ed006cb84 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 12:26:18 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java
index 7b87b30..d331b5b 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.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;
@@ -44,14 +44,13 @@
/**
* 有效期
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_DD)
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
private Date failTime;
/**
* 套餐id
*/
private Long taocanId;
-
-
/**
* 订单明细id 不明确
@@ -115,10 +114,23 @@
private String isCourse;
/**
+ * 任选套餐 是否无限次 Y-是 N-否
+ */
+ private String isInfinite;
+
+ /**
* 单次划扣次数
*/
private Integer deductionNum;
+ public String getIsInfinite() {
+ return isInfinite;
+ }
+
+ public void setIsInfinite(String isInfinite) {
+ this.isInfinite = isInfinite;
+ }
+
public String getIsCourse() {
return isCourse;
}
--
Gitblit v1.9.1