From 5d43370b99a03391c9271d04d3f351f0fd734dae Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 18 Mar 2021 20:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSku.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSku.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSku.java
index 4e53f55..5d5b051 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSku.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSku.java
@@ -12,7 +12,7 @@
*/
public class ShopSku extends EntityDTO{
@Extend
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
/**
@@ -59,9 +59,16 @@
private BigDecimal invitationPrice;
/**
- * 积分
+ * 消费可得积分
*/
private Integer score;
+
+ /**
+ * 积分兑换价格
+ */
+ private Integer scorePrice;
+
+
/**
* 排序
@@ -249,6 +256,14 @@
this.goodsName = goodsName;
}
+ public Integer getScorePrice() {
+ return scorePrice;
+ }
+
+ public void setScorePrice(Integer scorePrice) {
+ this.scorePrice = scorePrice;
+ }
+
@Override
public boolean equals(Object obj) {
//这里以name为判定标准。
--
Gitblit v1.9.1