From 458eba2d12e1c45ffd019c4b624c6fbc6e843add Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 02 Jun 2023 11:26:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java
index 92c1ad6..6e1e9d8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java
@@ -14,11 +14,6 @@
public class AlarmRecord extends BaseEntity {
/**
- * 区域名称
- */
- private String areaName;
-
- /**
* 测站名称
*/
private String alarmSurveyStationName;
@@ -47,11 +42,6 @@
* 水库编号
*/
private String reservoirNumber;
-
- /**
- * 水库名称
- */
- private String reservoirName;
/**
* 告警测站编号
--
Gitblit v1.9.3