From f3642777d395234ab33aa35f1f49a5c1ee9e9f15 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Jul 2021 10:45: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 | 14 ++++++++++++++
1 files changed, 14 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..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;
@@ -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,8 +45,10 @@
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;
--
Gitblit v1.9.1