From ec1f20c31d64ddbc5242c3942902bc5233a8a140 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 四月 2025 10:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java
index 4545acc..6237416 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -23,6 +24,9 @@
private Integer id;
//澶栭敭锛歩ns_product琛╥d
private Integer insProductId;
+
+ @ApiModelProperty("椤圭洰鍙傛暟id")
+ private Integer structureItemParameterId;
//妫�楠岄」
private String inspectionItem;
//妫�楠岄」瀛愮被
@@ -126,12 +130,19 @@
private String radius;
//鐢电紗鏍囪瘑
private String cableTag;
+ // 閲嶅鏍囪瘑
+ private String repetitionTag;
//鍘熸潗鏂欐壒閲忔爣璇�
private String rawMaterialTag;
//澶嶆祴娆℃暟鏍囪瘑
private String retestTag;
//鎺掑簭
private Integer sort;
+ // 缁戝畾鍊间笉鍙傚姞灞曠ず, 鍙弬鍔犺绠�
+ @ApiModelProperty(value = "鏄惁鏄粦瀹氬��, 0鍚�, 1鏄�")
+ private Integer isBinding;
+ @ApiModelProperty(value = "鑷叧鑱�(缁戝畾id)")
+ private Integer bindingProductId;
}
--
Gitblit v1.9.3