From 91fbc7bca400b7ce958e306f09133e4cfc6db63b Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 03 四月 2019 11:23:25 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' of ssh://192.168.1.226:29418/development/c++ into yangwu1.3

---
 QiaoJiaSystem/DataManagerServer/web-server接口.txt |    2 +-
 1 files changed, 1 insertions(+), 1 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..64c52f1 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"
@@ -461,7 +461,7 @@
 	"error": "erlang is null"
 }
 
-鏌ユ壘鍚屾搴曞簱 findLocalDatabase
+鏌ユ壘鏈湴搴曞簱 findLocalDatabase
 涓嬪彂锛氭棤
 杩斿洖锛�
 [{

--
Gitblit v1.8.0