From 0155e75a9b1189a7ba805faad55a359b2b8cd259 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Jun 2021 10:37:59 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java b/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java
index 88f9476..41dae17 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java
@@ -14,7 +14,7 @@
private String goodsNo;
- private String goodsName;
+ private String name;
private String unit;
@@ -30,12 +30,16 @@
* 是否抢购 1-是 2-否
*/
private Integer isQg;
+ public static final Integer ISQG_YES = 1;
+ public static final Integer ISQG_NO = 2;
private Date qgStartTime;
private Date qgEndTime;
private Integer isSale;
+ public static final Integer ISSALE_YES = 1;
+ public static final Integer ISSALE_NO = 2;
private Integer carbonEmissions;
}
--
Gitblit v1.9.1