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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Dec 26 19:47:11 CST 2017
-debugName=245
+#Tue Dec 26 20:15:16 CST 2017
+debugName=248
 versionName=613
-debugCode=245
+debugCode=248
 versionCode=152

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceDataFormAddActivity.java

@@ -2047,7 +2047,7 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
         progressDialog.show();
         click_btn.setEnabled(false);
         String url = null;
-        url = CommonUtil.getAppBaseUrl(ct) + "/mobile/oa/commonSaveAndSubmit.action";
+        url = CommonUtil.getAppBaseUrl(ct) + "/mobile/device/saveAndSubmitDeviceChange.action";
         Map<String, Object> params = new HashMap<>();
         params.put("caller", caller);
         params.put("formStore", formStore);