From 4f986140a10e71c07c7001ccbcda6e93e17736b1 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 23 四月 2024 15:59:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index 2630278..b67eb1b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -21,7 +21,7 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @ValueTableShow(2)
+ //@ValueTableShow(2)
@ApiModelProperty(value = "澶х被")
private String largeCategory;
@@ -68,7 +68,7 @@
private String subclass;
@ValueTableShow(13)
- @ApiModelProperty(value = "鍑哄巶缂栧彿")
+ @ApiModelProperty(value = "璁惧缂栫爜")
private String factoryNo;
@ValueTableShow(14)
@@ -90,7 +90,7 @@
@ValueTableShow(6)
@ApiModelProperty(value = "璁惧鐘舵��")
- private String deviceStatus;
+ private Integer deviceStatus;
@ValueTableShow(19)
@ApiModelProperty(value = "瀛樻斁鐐�")
@@ -149,4 +149,8 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+ @ValueTableShow(12)
+ @ApiModelProperty(value = "妫�楠岄」鐩�")
+ private String insProductIds;
+
}
--
Gitblit v1.9.3