From d6778b4c38c3c9dd70da46715efdaaafc366ab5f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 Nov 2021 18:38:39 +0800
Subject: [PATCH] 20211108

---
 gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 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 41dae17..a20de61 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;
@@ -26,6 +28,16 @@
 
     private String details;
 
+//    private String priceRange;
+
+    private String originalPrice;
+
+    private String presentPrice;
+
+    private String categoryId;
+
+    private String categoryName;
+
     /**
      * 是否抢购 1-是 2-否
      */
@@ -33,11 +45,14 @@
     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;
+    private Integer quotaTime;
     public static final Integer ISSALE_YES = 1;
     public static final Integer ISSALE_NO = 2;
 

--
Gitblit v1.9.1