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 colTime; private List 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;