From efafab5273ba3ff13a19f07088c320a5180188b6 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期四, 31 一月 2019 10:49:56 +0800
Subject: [PATCH] 1.2_布控feature: Auto stash before merge of "ywv1.2_布控feature" and "origin/ywv1.2_布控feature"
---
QiaoJiaSystem/DataManagerServer/web-server接口.txt | 8 ++++----
1 files changed, 4 insertions(+), 4 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 09d5596..0743bb8 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"
@@ -201,7 +201,7 @@
"str_longitude" : "39.994827",
"str_name" : "澶у崕鎽勫儚鏈�2",
"str_password" : "123456",
- "str_reserved" : "",
+ "str_reserved" : "group2/M00/02/7F/wKgBnFw1whWAT5DbAALrl1a_A04988.jpg", //瀹炴椂娴佹埅鍥�
// "str_sdks" : "1,2",
"str_username" : "admin"
},
@@ -216,7 +216,7 @@
"str_longitude" : "39.994833",
"str_name" : "澶у崕鎽勫儚鏈�3",
"str_password" : "123433",
- "str_reserved" : "",
+ "str_reserved" : "group2/M00/02/7F/wKgBnFw1whWAT5DbAALrl1a_A04988.jpg",//瀹炴椂娴佹埅鍥�
//"str_sdks" : "1,2,3",
"str_username" : "admin"
}
@@ -422,14 +422,14 @@
鏇存柊搴曞簱 updateDatabase
涓嬪彂锛�
{
- "createBy","", //鍒涘缓鑰�/鍒嗘瀽璁惧analyDev.甯冩帶骞冲彴conCemter
+ "createBy":"", //鍒涘缓鑰�/鍒嗘瀽璁惧analyDev.甯冩帶骞冲彴conCemter
"uuid":"", //琛╱uid
"TableType": "person", //琛ㄧ被鍨媝erson/car
"TableName": "test", //琛ㄥ悕
"SyncType": "1", //鍚屾绫诲瀷1鍚屾/0鏈湴搴�
"BwType": "1", //榛戠櫧鍚嶅崟1榛戝悕鍗�/0鐧藉悕鍗�
"StartTime": "2018-01-01 01:02:00", //寮�濮嬫椂闂�
- "EndTime": "2018-12-31 01:02:00" //缁撴潫鏃堕棿
+ "EndTime": "2018-12-31 01:02:00" , //缁撴潫鏃堕棿
"IsSync":"", //鏄惁鍚屾鍒板悗鍙颁复鏃跺簱 1 鏄� 0 涓嶆槸
"threshold":0-100, // 鍥剧墖闃堝�� 0-100
"enabled":"1" // 鏄惁鍚敤 1鍚敤 0鏈惎鐢�
--
Gitblit v1.8.0