From 4450dd41e8d5828e5da4d277c86e54551a6b6c15 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 16 Dec 2021 09:06:28 +0800 Subject: [PATCH] 设备新增,修改是工艺字段可以为多个,修改mapper,sql --- screen-api/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java b/screen-api/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java index d76bb32..b5056fd 100644 --- a/screen-api/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java +++ b/screen-api/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; +import java.util.Date; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -61,12 +63,12 @@ /** * ������������ */ - private LocalDateTime createTime; + private Date createTime; /** * ������������ */ - private LocalDateTime updateTime; + private Date updateTime; /** * ������������ @@ -74,9 +76,6 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } + } -- Gitblit v1.8.0