From 4e5ecd152044d53cc5853037eb60361fff4d11dc Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 14 Dec 2020 21:46:36 +0800
Subject: [PATCH] Merge branch 'master' into ty_urgent
---
zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java
index 32be44f..695a0ad 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java
@@ -425,10 +425,33 @@
private Integer useDateNum;
/**
- * 失效时间
+ * 统一失效时间
*/
private Date invalidTime;
+ private String isInfinite;
+
+ /**
+ * 支付方式 1-充值本金 2-赠送金额 3-积分
+ */
+ private String payMethods;
+
+ public String getPayMethods() {
+ return payMethods;
+ }
+
+ public void setPayMethods(String payMethods) {
+ this.payMethods = payMethods;
+ }
+
+ public String getIsInfinite() {
+ return isInfinite;
+ }
+
+ public void setIsInfinite(String isInfinite) {
+ this.isInfinite = isInfinite;
+ }
+
public Integer getBuyDateNum() {
return buyDateNum;
}
--
Gitblit v1.9.1