Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-07-27 9da9cb370473538e64f34d4b383407f03aef8ae2

 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;
}