From db043cb402515837303880cb0948d060e9d76490 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 17:13:16 +0800
Subject: [PATCH] 整合代码

---
 QiaoJiaSystem/DataManagerServer/web-server接口.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git "a/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt" "b/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
index 2fc9ad8..c8943af 100644
--- "a/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
+++ "b/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
@@ -287,8 +287,8 @@
 //瑙嗛鏃堕暱璁剧疆 cut_dura_edit
 涓嬪彂锛�
 {
-	"cut_max_duration" : 3
-        "cut_min_duration" : 3
+	"cut_max_duration" : 3,
+    "cut_min_duration" : 3
 }
 杩斿洖锛氭爣鍑嗚繑鍥炲��
 
@@ -461,7 +461,7 @@
 	"error": "erlang is null"
 }
 
-鏌ユ壘鍚屾搴曞簱 findLocalDatabase
+鏌ユ壘鏈湴搴曞簱 findLocalDatabase
 涓嬪彂锛氭棤
 杩斿洖锛�
 [{

--
Gitblit v1.8.0