Merge branch 'feature/eta2.5.9_api_stat' into debug

models/data_manage/edb_inspection/edb_inspection_message.go

@@ -157,7 +157,7 @@ func GetEdbInspectionMessageCountByAdminId(adminId int) (count int, err error) {
 
 func GetEdbInspectionMessagePageByAdminId(adminId, startSize, pageSize int) (items []*EdbInspectionMessage, err error) {
 	o := global.DbMap[utils.DbNameIndex]
-	sql := "SELECT * FROM edb_inspection_message WHERE admin_id =? ORDER BY is_read ASC, create_time DESC LIMIT?,?"
+	sql := "SELECT * FROM edb_inspection_message WHERE admin_id =? ORDER BY is_read ASC, create_time DESC LIMIT ?,?"
 	err = o.Raw(sql, adminId, startSize, pageSize).Find(&items).Error
 	return
 } 

models/message.go

@@ -1,7 +1,7 @@
 package models
 
 type WebsocketMessageResponse struct {
-	MessageType int `description:"消息类型:0-预警消息；1-巡检消息" json:"message_type"`
-	Data  interface{} `description:"消息数据" json:"data"`
+	MessageType int `description:"消息类型:0-预警消息；1-巡检消息"`
+	Data  interface{} `description:"消息数据"`
 }