From 6c78189261b45036f918c35ceb5f6106db3e543a Mon Sep 17 00:00:00 2001 From: zch Date: Fri, 21 Mar 2025 15:34:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(dms):=20=E6=B7=BB=E5=8A=A0=20machineName?= =?UTF-8?q?=20=E5=AD=97=E6=AE=B5=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=B1=95=E7=A4=BA,@TableId=E6=B3=A8=E8=A7=A3=E4=B8=BB?= =?UTF-8?q?=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/dms/domain/DmsBaseDeviceFiles.java | 7 +++++++ .../org/dromara/dms/domain/vo/DmsBaseDeviceFilesVo.java | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceFiles.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceFiles.java index 2b2a287b..37dcbde3 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceFiles.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceFiles.java @@ -24,6 +24,7 @@ public class DmsBaseDeviceFiles extends TenantEntity { /** * 主键标识 */ + @TableId(value = "device_files_id", type = IdType.AUTO) private Long deviceFilesId; /** @@ -56,5 +57,11 @@ public class DmsBaseDeviceFiles extends TenantEntity { */ private String remark; + /** + * 机台名称 + */ + @TableField(exist = false) + private String machineName;//JOIN + } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceFilesVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceFilesVo.java index 59c45ad0..b84131c5 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceFilesVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceFilesVo.java @@ -71,5 +71,10 @@ public class DmsBaseDeviceFilesVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 机台名称 + */ + private String machineName;//JOIN + }