Merge remote-tracking branch 'origin/master'

server/model/admin/request/qsh_monitor_data.go

@@ -8,6 +8,6 @@ import (
 type QshMonitorDataSearch struct {
 	admin.QshMonitorData
 	request.PageInfo
-	StartTime string `json:"start_time"`
-	EndTime   string `json:"end_time"`
+	StartTime string `json:"start_time" form:"start_time"`
+	EndTime   string `json:"end_time" form:"end_time"`
 }

server/utils/fn.go

@@ -41,5 +41,5 @@ func GetYinShiAccessToken(userName string) (string, error) {
 
 // GetCameraUrl 获取监控播放地址
 func GetCameraUrl(deviceId string) string {
-	return fmt.Sprintf("ezopen://open.ys7.com/%s/1.hd.live", deviceId)
+	return fmt.Sprintf("ezopen://open.ys7.com/%s/1.live", deviceId)
 }