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

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

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

@@ -428,11 +428,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
                 break;
 
             case R.id.bt_save:
-
-                if (et_leave_man.testValidity() &&
-//                        et_leave_days.testValidity() &&
-//                        et_leave_hours.testValidity() &&
-                        et_leave_reason.testValidity() &&
+                if (et_leave_reason.testValidity() &&
                         tv_start_time.testValidity() &&
                         tv_end_time.testValidity() &&
                         et_leave_category.testValidity()
@@ -446,7 +442,6 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
                         ToastMessage("结束时间小于开始时间！");
                     } else {
                         progressDialog.show();
-//                        getPreHttpData();
                         httpSave();
                     }
                 }