From 8577a11e5093871b2b5d6988431e7e22e76d43e6 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 29 四月 2024 01:46:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
index 10706d8..73c7a87 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
@@ -1,15 +1,13 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
/**
* 鏍囧噯鏍戜笅鐨勬楠岄」鐩�
@@ -30,17 +28,17 @@
@ApiModelProperty("妫�楠岄」")
private String inspectionItem;
- /**
- * 妫�楠岄」鍒嗙被
- */
- @ApiModelProperty("妫�楠岄」鍒嗙被")
- private String inspectionItemClassify;
+ @ApiModelProperty("妫�楠岄」EN")
+ private String inspectionItemEn;
/**
* 妫�楠岄」灏忕被
*/
@ApiModelProperty("妫�楠岄」灏忕被")
private String inspectionItemSubclass;
+
+ @ApiModelProperty("妫�楠岄」灏忕被EN")
+ private String inspectionItemSubclassEn;
/**
* 瀹為獙瀹�
@@ -88,12 +86,6 @@
private String inspectionValueType;
/**
- * 璁惧缁�
- */
- @ApiModelProperty("璁惧缁�")
- private String deviceGroup;
-
- /**
* 妫�楠屾鏁�
*/
@ApiModelProperty("妫�楠屾鏁�")
@@ -106,16 +98,13 @@
private String section;
/**
- * 鍙栧�肩被鍨�
- */
- @ApiModelProperty("鍙栧�肩被鍨�")
- private String valueType;
-
- /**
* 鏂规硶
*/
- @ApiModelProperty("鏂规硶")
+ @ApiModelProperty("鏂规硶鍒楄〃")
private String method;
+
+ @ApiModelProperty("鏂规硶")
+ private String methodS;
/**
* 棰勮鏃堕棿(澶�)
@@ -135,7 +124,7 @@
@ApiModelProperty("瑕佹眰鍊�")
private String ask;
- @ApiModelProperty("瑕佹眰鍊�")
+ @ApiModelProperty("瑕佹眰鎻忚堪")
private String tell;
/**
@@ -185,4 +174,8 @@
@ApiModelProperty("1锛氭湁鏁� 0锛氭棤鏁�")
private Integer state;
+
+ private String dic;
+
+ private String tree;
}
\ No newline at end of file
--
Gitblit v1.9.3