From f79f18bf3e65ad0eaf8fd1feb788bf792e362520 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期四, 01 八月 2019 15:05:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 controllers/syssetcont.go |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/controllers/syssetcont.go b/controllers/syssetcont.go
index ef1888c..61a4116 100644
--- a/controllers/syssetcont.go
+++ b/controllers/syssetcont.go
@@ -16,6 +16,8 @@
 	Id string  `json:"id"`
 	AlarmIp string `json:"alarm_ip,omitempty" example:"192.168.1.182"`
 	AlarmPort int `json:"alarm_port,omitempty" example:"22122"`
+	AlarmThresholdType int `json:"alarm_threshold_type"`//鎶ヨ闃堝�肩被鍨嬭缃細1:鎸夋渶楂樺垎,2:鎸夐槇鍊间互涓�
+	AlarmThreshold int `json:"alarm_threshold"`//鎶ヨ闃堝��
 	WebPicIp string `json:"web_pic_ip,omitempty" example:""`
 	WebPicPort int `json:"web_pic_port,omitempty" example:"22122"`
 	EsPicIp string `json:"es_pic_ip,omitempty" example:""`

--
Gitblit v1.8.0