From ef4ad171c46f615a5b719bac70c468b561bc08ac Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 08 Dec 2021 11:22:43 +0800
Subject: [PATCH] Merge branch 'score-shop' into xc-prd
---
gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java | 4 ++++
1 files changed, 4 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 61cf63f..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,6 +1,7 @@
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;
@@ -44,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