From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java
index 5057ab4..440cac1 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java
@@ -13,15 +13,15 @@
*/
@Data
public class ShopProduct extends EntityDTOExt {
+ /**
+ * 可用积分
+ */
+ public static final int PAYFOR_SCORE =1;
+ /**
+ * 不用积分
+ */
+ public static final int NOT_PAYFOR_SCORE =2;
- /**
- * 卖场-微商城
- */
- public static final int MALL_MICRO =1;
- /**
- * 卖场-积分商城
- */
- public static final int MALL_SCORE=2;
/**
* 可分销
*/
@@ -80,9 +80,9 @@
private String imgMobile;
/**
- * 上架卖场 1 微商城，2 积分商城
+ * 是否可用积分支付 1是，2不是
*/
- private Integer mallType;
+ private Integer ableScorePay;
/**
--
Gitblit v1.9.1