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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/SelectCalendarActivity.java

WeiChat/src/main/java/com/xzjmyk/pm/activity/CustomCrashActivity.java

@@ -12,7 +12,6 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.Toast;
 
-import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -69,8 +68,8 @@ public class CustomCrashActivity extends Activity {
         if (stackTraceString != null){
             //Toast.makeText(this, stackTraceString, Toast.LENGTH_LONG).show();
             //TODO 发布版本隐藏
-            new MaterialDialog.Builder(this).content(stackTraceString)
-                    .build().show();
+//            new MaterialDialog.Builder(this).content(stackTraceString)
+//                    .build().show();
             try {
                 getCode();
             } catch (Exception e) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiPlatform.java

@@ -62,7 +62,7 @@ public class ApiPlatform extends ApiBase implements ApiModel {
         setList_feePlease(mBaseUrl + "/feePlease/getFeePlease");
 
         //审批流
-        setGetAuditTodo(mBaseUrl+"mobile/approvalflow/getAuditTodo");
+        setGetAuditTodo(mBaseUrl+"/approvalflow/getAuditTodo");
 
         setObtain_announce_url(OBTAIN_ANNOUNCE_URL);
         setPunch_address_url(PUNCH_ADDRESS_URL);