From 38a2db2a4b3a67e27d874f0f2fdb64cff3325ccf Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Wed, 27 Jul 2022 17:33:09 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/BaseDomain.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/BaseDomain.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/BaseDomain.java
index 9be3a5d..3640c29 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/BaseDomain.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/BaseDomain.java
@@ -44,8 +44,7 @@
this.updateTime = updateTime;
}
-
-// @TableLogic
+ // @TableLogic
// @JsonIgnore
// private Integer isDel;
}
--
Gitblit v1.9.2