Merge branch 'jwy' of http://47.100.114.196:3001/jwy/aeon_business_back into zhc

合并告警字段
1 changed files with 1 additions and 0 deletions
--- a/data-center-business-controller/src/main/resources/db/migration/V104__continuous_alarm.sql
+++ b/data-center-business-controller/src/main/resources/db/migration/V104__continuous_alarm.sql
@ -0,0 +1 @@
 ALTER TABLE alert_history ADD `merge_alarm_flag` int DEFAULT '0' COMMENT '是否合并告警，0-不合并，1-合并';
Author	SHA1	Message	Date
zhczyx	3465aab7d5	Merge branch 'jwy' of http://47.100.114.196:3001/jwy/aeon_business_back into zhc	2 weeks ago
review512jwy@163.com	143f3db30b	合并告警字段	2 weeks ago
	`@ -0,0 +1 @@`
					ALTER TABLE alert_history ADD `merge_alarm_flag` int DEFAULT '0' COMMENT '是否合并告警，0-不合并，1-合并';