From 0087434cc70ca8cee692be654d9e1c6ec82c3da7 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 21:09:21 +0800
Subject: [PATCH] 数采bug调整

---
 cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 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 254d103..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;
@@ -32,15 +33,6 @@
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty("鏂囦欢鍚庣紑")
-    private String fileType;
-
-    @ApiModelProperty("閲囬泦鍦板潃")
-    private String collectUrl;
-
-    @ApiModelProperty("瀛樺偍鍦板潃")
-    private String storageUrl;
-
     @ApiModelProperty("鍏紡")
     private String formula;
 
@@ -51,14 +43,24 @@
     private String refery;
 
     @ApiModelProperty("x")
-    private Integer x;
+    private String x;
 
     @ApiModelProperty("y")
-    private Integer y;
+    private String y;
 
     @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