From 02b38bb7c08d68fffc6af25e4ba00a456d96e94e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Jun 2021 16:22:54 +0800
Subject: [PATCH] modify
---
gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java | 20 +++++++++++++++++++-
1 files changed, 19 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..ba6f0f7 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
@@ -1,7 +1,9 @@
package com.xzx.gc.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xzx.gc.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
@@ -14,7 +16,7 @@
private String goodsNo;
- private String goodsName;
+ private String name;
private String unit;
@@ -26,16 +28,32 @@
private String details;
+// private String priceRange;
+
+ private String originalPrice;
+
+ private String presentPrice;
+
+ 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;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date qgStartTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
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