From 1d915922d8197aa5d5dc3e40e3088d983dd6e141 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 13 三月 2026 17:57:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/quality/pojo/RawMaterial.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
new file mode 100644
index 0000000..bb7f632
--- /dev/null
+++ b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
@@ -0,0 +1,65 @@
+package com.ruoyi.quality.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-13 02:44:09
+ */
+@Getter
+@Setter
+@TableName("raw_material")
+@ApiModel(value = "鍘熸枡", description = "")
+public class RawMaterial implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("浜у搧鍨嬪彿id")
+ private Long productModelId;
+
+ @ApiModelProperty("鎵规鍙�")
+ private String batchNo;
+
+ @ApiModelProperty("妫�楠岀被鍨� 0鍏ュ満妫� 1杞﹂棿妫� 2鍑哄巶妫�")
+ private Integer checkType;
+
+ @ApiModelProperty("妫�楠岀粨鏋� 0鍚堟牸 1涓嶅悎鏍�")
+ private Integer checkResult;
+
+ @ApiModelProperty("绫诲埆(0:鏈彁浜�;1:宸叉彁浜�)")
+ private Integer inspectState;
+
+ @ApiModelProperty("妫�楠屽憳鍚嶇О")
+ private String checkUserName;
+
+ @ApiModelProperty("妫�楠屾棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate checkTime;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+}
--
Gitblit v1.9.3