From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期一, 06 十一月 2023 23:40:59 +0800 Subject: [PATCH] 更新仓内抓拍2 --- igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java | 35 +++++++---------------------------- 1 files changed, 7 insertions(+), 28 deletions(-) diff --git a/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java b/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java index 2470036..6436f8d 100644 --- a/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java +++ b/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java @@ -3,11 +3,9 @@ import com.bstek.dorado.annotation.PropertyDef; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; - import javax.persistence.*; import java.io.Serializable; import java.util.Date; -import java.util.List; /** * 璁惧淇℃伅 @@ -21,29 +19,17 @@ private static final long serialVersionUID = 1L; @Id - @Column(name = "ID_", length = 40) - @PropertyDef(label = "ID") - private String id; - - @Column(name = "kqdm", length = 40) - @PropertyDef(label = "搴撳尯浠g爜") - private String kqdm; + @Column(name = "sbbh", length = 20) + @PropertyDef(label = "璁惧缂栧彿") + private String sbbh; @Column(name = "COMPANY_ID_", length = 10) @PropertyDef(label = "缁勭粐缂栫爜", description = "") private String companyId; - @Column(name = "dwdm", length = 18) - @PropertyDef(label = "鍗曚綅浠g爜") - private String dwdm; - - @Column(name = "kqmc", length = 256) - @PropertyDef(label = "搴撳尯鍚嶇О") - private String kqmc; - - @Column(name = "sbbh", length = 20) - @PropertyDef(label = "璁惧缂栧彿") - private String sbbh; + @Column(name = "DEPT_ID_", length = 40) + @PropertyDef(label = "鎵�灞炲簱鍖�") + private String deptId; @Column(name = "sbyqmc", length = 50) @PropertyDef(label = "璁惧浠櫒鍚嶇О") @@ -76,7 +62,6 @@ @Column(name = "jdsj") @PropertyDef(label = "妫�瀹氭椂闂�") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date jdsj; @Column(name = "jddw", length = 256) @@ -85,12 +70,6 @@ @Column(name = "UPDATE_TIME_") @PropertyDef(label = "鏇存柊鏃堕棿") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date updateTime; - - /** - * 妫�淇褰� - */ - @Transient - private List<DeviceCheckup> checkupList; + } -- Gitblit v1.9.3