报错解决，pull 合并。push备份

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

@@ -17,15 +17,16 @@ import com.andreabaccega.widget.FormEditText;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.core.model.SelectBean;
 import com.core.app.Constants;
+import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
-import com.core.widget.view.Activity.SelectActivity;
+import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
+import com.core.utils.timeutils.wheel.DateTimePicker;
+import com.core.widget.view.Activity.SelectActivity;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;

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

@@ -39,6 +39,12 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.presenter.AddVisitReportPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IAddVisitReport;
+import com.core.utils.TimeUtils;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.PopupWindowHelper;
+import com.core.utils.RecognizerDialogUtil;
+import com.core.widget.MyListView;
+import com.core.utils.timeutils.wheel.OASigninPicker;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -205,7 +205,7 @@ public class OAMainActivity extends OABaseActivity implements View.OnClickListen
             case R.id.mission_tv:
                 boolean isAutoMission = PreferenceUtils.getBoolean(AppConfig.AUTO_MISSION, false);
                 if (isAutoMission) {
-                    intent = new Intent(activity, MissionActivity.class);
+//                    intent = new Intent(activity, MissionActivity.class);
                     intent.putExtra("flag", 1);
                 } else {
                     intent = new Intent(activity, OutofficeActivity.class);

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/AutoErpSigninUitl.java

@@ -56,6 +56,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.core.constant.AppConstant.CHANGE_WORK_TASK;
 import static com.core.net.http.ViewUtil.ct;
 import static com.xzjmyk.pm.activity.util.oa.CommonUtil.getSharedPreferences;