From d397b54e3924c55e80782a80d9f19d616d40ccba Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 16:53:40 +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/ScoreGoodsStyle.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoodsStyle.java b/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoodsStyle.java
index 63a62ff..6200316 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoodsStyle.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoodsStyle.java
@@ -1,13 +1,32 @@
package com.xzx.gc.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xzx.gc.common.entity.BaseEntity;
import lombok.Data;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
import javax.persistence.Table;
+import java.util.Date;
@Data
@Table(name = "xzx_score_goods_style")
-public class ScoreGoodsStyle extends BaseEntity {
+public class ScoreGoodsStyle{
+
+
+ private String createdBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdTime;
+
+ private short delFlag;
+
+ private Integer revision;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Long id;
private String name;
--
Gitblit v1.9.1