From 26647c137ff2f06de8aa7032c1d4dffba40e24ba Mon Sep 17 00:00:00 2001
From: xiaoguangbin <xiaoguangbin>
Date: Thu, 2 Jan 2025 15:12:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B8=E7=B4=A0=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E5=A2=9E=E5=8A=A0QC=20=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/modules/base/dto/AlarmAnalysisRuleInfo.java     | 4 ++++
 .../jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmAnalysisRuleInfo.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmAnalysisRuleInfo.java
index 370a6625..e75b6e87 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmAnalysisRuleInfo.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmAnalysisRuleInfo.java
@@ -28,6 +28,10 @@ public class AlarmAnalysisRuleInfo implements Serializable {
 
     private String remark;
 
+    private String sample;
+
+    private String sampleType;
+
     private List<String> colTime;
 
     private List<String> acqTime;
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java
index 57a527ca..4efb26be 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java
@@ -37,6 +37,10 @@ public class AlarmAnalysisRule extends JeecgEntity {
 	/** 联系人组id */
 	private String contactGroup;
 
+	private String sample;
+
+	private String sampleType;
+
 	private String colTime;
 
 	private String acqTime;