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 2b2a287..37dcbde 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 59c45ad..b84131c 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 + }