Commit c61b0ef2 authored by mahui's avatar mahui

Merge remote-tracking branch 'origin/master'

parents 378f5cc7 67a7a06e
...@@ -8,6 +8,6 @@ import ( ...@@ -8,6 +8,6 @@ import (
type QshMonitorDataSearch struct { type QshMonitorDataSearch struct {
admin.QshMonitorData admin.QshMonitorData
request.PageInfo request.PageInfo
StartTime string `json:"start_time"` StartTime string `json:"start_time" form:"start_time"`
EndTime string `json:"end_time"` EndTime string `json:"end_time" form:"end_time"`
} }
...@@ -41,5 +41,5 @@ func GetYinShiAccessToken(userName string) (string, error) { ...@@ -41,5 +41,5 @@ func GetYinShiAccessToken(userName string) (string, error) {
// GetCameraUrl 获取监控播放地址 // GetCameraUrl 获取监控播放地址
func GetCameraUrl(deviceId string) string { 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)
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment