From 42eafe650bb4b4084be2059dbbbbc10b3b81c7c7 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期三, 27 七月 2022 17:12:49 +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