Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq

chenshijun

2019-03-30 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d

 syncDBTool/ErlangDbTool.cpp

@@ -13,6 +13,7 @@
#include <QtCore/QVariantList>
#include <basic/util/app/AppPreference.hpp>


using ErlangTool::map_DevDataCache;
using ErlangTool::map_TabDataCache;
using ErlangTool::map_BwDataCache;