From 1b5604f8a88000e2f51d4c989fd179989468ee67 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 11 八月 2025 09:48:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys' into pim_ywx
---
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 008752c..e1b2e6a 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,7 +19,7 @@
*/
@TableName(value = "quality_inspect")
@Data
-public class QualityInspect implements Serializable {
+public class QualityInspect extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -40,6 +41,8 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
+
+
/**
@@ -130,5 +133,10 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ /**
+ * 绫诲埆(0:鏈彁浜�;1:宸叉彁浜�)
+ */
+ private Integer inspectState;
+
}
--
Gitblit v1.9.3