From d25897a9e4a96079e3ef9d767083e631ead13a1c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Jul 2021 16:23:51 +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/common/entity/BaseEntity.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/common/entity/BaseEntity.java b/gc-core/src/main/java/com/xzx/gc/common/entity/BaseEntity.java
index c7fb9cc..b323cf5 100644
--- a/gc-core/src/main/java/com/xzx/gc/common/entity/BaseEntity.java
+++ b/gc-core/src/main/java/com/xzx/gc/common/entity/BaseEntity.java
@@ -19,7 +19,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createdTime;
- private String delFlag;
+ private short delFlag;
private Integer revision;
--
Gitblit v1.9.1