[百度地图没有问题的索引号]

Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer_fix

# Conflicts:
#	WeiChat/version.properties
#	app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceDataFormAddActivity.java

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Dec 01 13:34:38 CST 2017
-debugName=14
+#Tue Jan 09 11:34:21 CST 2018
+debugName=15
 versionName=611
-debugCode=14
+debugCode=15
 versionCode=150