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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue May 15 08:16:05 CST 2018
-debugName=246
+#Tue May 15 11:28:04 CST 2018
+debugName=250
 versionName=630
-debugCode=246
+debugCode=250
 versionCode=170

app_core/common/src/main/java/com/core/base/OABaseActivity.java

@@ -10,7 +10,7 @@ import com.core.utils.ToastUtil;
  * Created by Bitliker on 2017/1/17.
  */
 
-public class OABaseActivity extends SupportToolBarActivity implements HttpImp {
+public class OABaseActivity extends BaseActivity implements HttpImp {
     @Override
     public void showLoading() {
         try {

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BookingSetActivity.java

@@ -14,11 +14,10 @@ import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.OABaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.time.wheel.TimePicker;
-import com.core.widget.view.imp.HttpImp;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
 import com.lidroid.xutils.ViewUtils;
 import com.uas.appme.R;
@@ -32,7 +31,7 @@ import java.util.Map;
  * @desc:设置时间段
  * @author：Arison on 2017/6/26
  */
-public class BookingSetActivity extends OABaseActivity implements HttpImp, View.OnClickListener {
+public class BookingSetActivity extends SupportToolBarActivity implements  View.OnClickListener {
 
     private Button submit_btn;
     private TextView tv_endTime;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/WorkActivity.java

@@ -1,6 +1,5 @@
 package com.uas.appworks.OA.erp.activity;
 
-import android.Manifest;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;