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

# Conflicts:
#	WeiChat/src/main/res/values-zh-rCN/strings.xml
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Feb 08 15:51:55 CST 2018
-debugName=238
+#Thu Feb 08 16:46:02 CST 2018
+debugName=239
 versionName=620
-debugCode=238
+debugCode=239
 versionCode=159

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

@@ -620,7 +620,7 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
         setContentView(R.layout.activity_data_form_detail);
         initView();
         initListener();
-
+        LogUtil.i("TravelDataFormDetailActivity onCreate");
         initData();
     }