From c13cc7349ca2a5ffa8eb1d41c583ceef2647abdb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 24 Jun 2021 14:57:35 +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 | 13 ++++++++++++-
1 files changed, 12 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..8f534a1 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
@@ -2,6 +2,7 @@
import com.xzx.gc.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
@@ -14,7 +15,7 @@
private String goodsNo;
- private String goodsName;
+ private String name;
private String unit;
@@ -26,16 +27,26 @@
private String details;
+ private String priceRange;
+
+ private String categoryId;
+
+ private String categoryName;
+
/**
* 是否抢购 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