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

# Conflicts:
#	WeiChat/version.properties
#	app_third/libbdupdatesdk/src/main/AndroidManifest.xml

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorkPlatFragment.java

@@ -561,8 +561,8 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
 
     @Override
     public void requestError(int what, String errorMsg) {
-//        if (errorMsg != null && errorMsg.length() <= 40) {
-//            toast(errorMsg);
-//        }
+        if (errorMsg != null && errorMsg.length() <= 40) {
+            toast(errorMsg);
+        }
     }
 }

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Dec 14 10:55:59 CST 2018
+#Fri Dec 14 15:53:54 CST 2018
 debugName=972
-versionName=651
+versionName=652
 debugCode=972
-versionCode=206
+versionCode=207