From 63328dd80adc6331db581dda6418308e6fd4da12 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 13 一月 2026 16:50:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java | 96 +++++++++++++++++++++---------------------------
1 files changed, 42 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
index be5d472..d2fb853 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
@@ -1,84 +1,72 @@
package com.ruoyi.quality.pojo;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
-import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
/**
- * 璐ㄩ噺绠＄悊--妫�娴嬫寚鏍囩淮鎶�
- * quality_test_standard
+ * <p>
+ * 妫�娴嬫爣鍑嗕富琛�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-13 03:40:24
*/
-@TableName(value = "quality_test_standard")
-@Data
+@Getter
+@Setter
+@TableName("quality_test_standard")
+@ApiModel(value = "QualityTestStandard瀵硅薄", description = "妫�娴嬫爣鍑嗕富琛�")
public class QualityTestStandard implements Serializable {
+
private static final long serialVersionUID = 1L;
- /**
- * 搴忓彿
- */
- @TableId(type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
+ @ApiModelProperty("鏍囧噯缂栧彿")
+ private String standardNo;
- /**
- * 鎸囨爣
- */
- @Excel(name = "鎸囨爣")
- private String parameterItem;
+ @ApiModelProperty("鏍囧噯鍚嶇О")
+ private String standardName;
- /**
- * 鍗曚綅
- */
- @Excel(name = "鍗曚綅")
- private String unit;
+ @ApiModelProperty("澶囨敞")
+ private String remark;
- /**
- * 鏍囧噯鍊�
- */
- @Excel(name = "鏍囧噯鍊�")
- private String standardValue;
-
- /**
- * 鍐呮帶鍊�
- */
- @Excel(name = "鍐呮帶鍊�")
- private String controlValue;
-
- /**
- * 鍏宠仈浜у搧id
- */
- @NotBlank(message = "浜у搧id涓嶈兘涓虹┖!")
- @Excel(name = "鍏宠仈浜у搧id")
- private Long productId;
-
-
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ApiModelProperty("鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @ApiModelProperty("鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
- private Integer createUser;
+ private Long createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @ApiModelProperty("淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @ApiModelProperty("淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
+ private Long updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @ApiModelProperty("绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty("鐘舵��")
+ private String state;
+ @ApiModelProperty("绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)")
+ private Integer inspectType;
+
+ @ApiModelProperty("宸ュ簭id")
+ private Integer processId;
}
--
Gitblit v1.9.3