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/cameraTask.go | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/controllers/cameraTask.go b/controllers/cameraTask.go
index 4066ceb..0e3b139 100644
--- a/controllers/cameraTask.go
+++ b/controllers/cameraTask.go
@@ -256,7 +256,11 @@
var api dbapi.CameraTaskApi
flag, data := api.UpdateCameraTaskStatus(paramVo.CameraId, paramVo.TaskId, paramVo.Status)
if flag {
- util.ResponseFormat(c,code.Success,data)
+ if data.(string) == "姝や换鍔′负鍋滅敤鐘舵�侊紝璇峰湪浠诲姟绠＄悊涓紑鍚紒"{
+ util.ResponseFormat(c,code.TaskStoped,data)
+ } else {
+ util.ResponseFormat(c,code.UpdateSuccess,data)
+ }
} else {
util.ResponseFormat(c,code.ComError,data)
}
--
Gitblit v1.8.0