From 9895be644e5f4d8b03170fcdfedb9fc57d90f2d8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 31 七月 2024 18:04:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java
index a501281..6c4c769 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -50,6 +51,16 @@
@ApiModelProperty("璁惧id")
private Integer deviceId;
- @ApiModelProperty("妫�楠岄」鐩悕绉�")
+ @ApiModelProperty("妫�楠岄」鐩�")
+ private String inspectionItem;
+
+ @ApiModelProperty("妫�楠岄」瀛愰」")
+ private String inspectionItemSubclass;
+
+ @TableField(exist = false)
+ @ApiModelProperty("妫�楠岄」瀛愰」")
private String insProductItem;
+
+ @ApiModelProperty("妫�楠岄」id")
+ private Integer structureItemParameterId;
}
--
Gitblit v1.9.3