From 9f122a41255d18f04a82d8be3b038a95c2c18d95 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:26:08 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/BaseDomain.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/BaseDomain.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/BaseDomain.java
index ea18fe5..f45dd38 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/BaseDomain.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/BaseDomain.java
@@ -24,9 +24,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
- public static long getSerialVersionUID() {
- return serialVersionUID;
- }
+// @TableLogic
+// @JsonIgnore
+// private Integer isDel;
+
public Date getCreateTime() {
return createTime;
@@ -43,8 +44,4 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
-
- // @TableLogic
-// @JsonIgnore
-// private Integer isDel;
}
--
Gitblit v1.9.2