From cc59b65bc63b839127c29775bcd410dd407de66d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 21 四月 2025 17:20:02 +0800
Subject: [PATCH] 设备采购计划与设备照片

---
 platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Device.java |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Device.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Device.java
index c54c664..ba939c8 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Device.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Device.java
@@ -1,7 +1,11 @@
 package com.by4cloud.platformx.device.entity;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.by4cloud.platformx.admin.api.utils.UpmsCacheUtil;
+import com.by4cloud.platformx.common.data.mybatis.BaseModel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -25,7 +29,7 @@
 @TableName("device")
 @javax.persistence.Table(name = "device")
 @Table(appliesTo = "device", comment = "鍑虹璁惧娓呭崟琛�")
-public class Device extends DeviceBaseModel<Device>{
+public class Device extends BaseModel<Device> {
 	@Schema(description = "鍒嗙被ID")
 	@Column(columnDefinition="long comment '鍒嗙被ID'")
 	private Long classId;
@@ -45,6 +49,9 @@
 	@Schema(description = "鍒堕�犲巶鍟�")
 	@Column(columnDefinition="VARCHAR(64) comment '鍒堕�犲巶鍟�'")
 	private String manu;
+	@Schema(description = "鍒堕�犲巶鍟�")
+	@Column(columnDefinition="long comment '鍒堕�犲巶鍟�'")
+	private Long manuId;
 	@Schema(description = "鍙戝竷浜�")
 	@Column(columnDefinition="VARCHAR(64) comment '鍙戝竷浜�'")
 	private String releasePerson;
@@ -71,8 +78,29 @@
 	@Column(columnDefinition="int comment '搴撳瓨鏁�'")
 	private Integer num;
 
-	@Transient
-	@TableField(exist = false)
-	private String reqCompName;
+	@Schema(description = "澶囨敞")
+	@Column(columnDefinition="VARCHAR(64) comment '澶囨敞'")
+	private String remark;
+
+	@Column(
+			columnDefinition = "varchar(100) comment '鍚嶇О'"
+	)
+	private String name;
+	@Column(
+			columnDefinition = "varchar(200) comment '瑙勬牸鍨嬪彿'"
+	)
+	private String specification;
+	@Column(
+			columnDefinition = "int comment '鍒拌揣鏈堜唤'"
+	)
+	private Integer month;
+	@Column(
+			columnDefinition = "varchar(20) comment '鍗曚綅'"
+	)
+	private String unit;
+	@Column(
+			columnDefinition = "double(10,2) comment '鍗曚环'"
+	)
+	private Double price;
 
 }

--
Gitblit v1.9.1