From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 9824694..7eae13c 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
@@ -210,7 +210,7 @@
/**
* 单会员是否只买一次
*/
- private String isOnce;
+ private Integer isOnce;
/**
* 销售平台
@@ -448,6 +448,19 @@
* 支付方式 1-充值本金 2-赠送金额 3-积分
*/
private String payMethods;
+
+ /**
+ * 是否合作项目
+ */
+ private Integer isCooperate;
+
+ public Integer getIsCooperate() {
+ return isCooperate;
+ }
+
+ public void setIsCooperate(Integer isCooperate) {
+ this.isCooperate = isCooperate;
+ }
public String getAchieveRuleName() {
return achieveRuleName;
@@ -1002,11 +1015,12 @@
this.saleOffTime = saleOffTime;
}
- public String getIsOnce() {
+
+ public Integer getIsOnce() {
return isOnce;
}
- public void setIsOnce(String isOnce) {
+ public void setIsOnce(Integer isOnce) {
this.isOnce = isOnce;
}
--
Gitblit v1.9.1