From e2c5017787d7fc5eea2afb8bc84bca0db054ad8c Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 09 四月 2025 17:46:36 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java
index ba9cb6a..1c192e7 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
* 涓婚敭id
*/
@TableId(type = IdType.AUTO)
- private Integer id;
+ private Long id;
@ApiModelProperty("椤圭洰鍙傛暟id")
private Integer structureItemParameterId;
@@ -180,7 +181,7 @@
private Integer insBushId;
@ApiModelProperty("鏍囧噯鏂规硶id")
- private Integer standardMethodListId;
+ private Long standardMethodListId;
//杩斿洖鐨�20搴﹀父娓╃殑璁＄畻鍊�(娓╁害寰幆)
@TableField(exist = false ,select = false)
@@ -211,4 +212,7 @@
@ApiModelProperty(value = "鑷叧鑱�(缁戝畾id)")
private Integer bindingProductId;
+ @ApiModelProperty(value = "妫�楠屼汉鍛業D")
+ private Integer checkUserId;
+
}
--
Gitblit v1.9.3