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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Apr 20 10:48:22 CST 2018
-debugName=142
+#Tue Apr 24 09:41:13 CST 2018
+debugName=143
 versionName=613
-debugCode=142
+debugCode=143
 versionCode=152

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/BusinessTravelActivity.java

@@ -2,6 +2,7 @@ package com.uas.appworks.OA.platform.activity;
 
 import android.content.Intent;
 import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -57,7 +58,7 @@ import java.util.Map;
 
 public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHttpListener {
     private BaseRefreshLayout mRefreshLayout;
-    private EmptyRecyclerView mRecyclerView;
+    private RecyclerView mRecyclerView;
     private RelativeLayout remainRl;
     private TextView remainTag;
     private TextView remainTv;