From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 789b879..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
@@ -449,6 +449,19 @@
*/
private String payMethods;
+ /**
+ * 是否合作项目
+ */
+ private Integer isCooperate;
+
+ public Integer getIsCooperate() {
+ return isCooperate;
+ }
+
+ public void setIsCooperate(Integer isCooperate) {
+ this.isCooperate = isCooperate;
+ }
+
public String getAchieveRuleName() {
return achieveRuleName;
}
--
Gitblit v1.9.1