From 70f01fd17bb642c2f773d5c5567018d7573a2dde Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 12 Mar 2021 17:31:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
index dc1ab8f..e8fa312 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
@@ -160,7 +160,7 @@
 	@TableField("czTime")
 	private String czTime;
 	private String bz;
-	private int cid;
+	private String cid;
 
 
 }

--
Gitblit v1.9.3