Эх сурвалжийг харах

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

# Conflicts:
#	WeiChat/version.properties
#	app_third/libbdupdatesdk/src/main/AndroidManifest.xml
Arison 7 жил өмнө
parent
commit
77758f1ee4

+ 5 - 5
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Dec 10 15:12:53 CST 2018
-debugName=971
-versionName=650
-debugCode=971
-versionCode=205
+#Fri Dec 14 10:55:59 CST 2018
+debugName=972
+versionName=651
+debugCode=972
+versionCode=206

+ 1 - 1
app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/ChangeMobileActivity.java

@@ -290,7 +290,7 @@ public class ChangeMobileActivity extends BaseActivity {
     /*补卡申请申诉*/
     private void suppleSignin(String message) {
         progressDialog.show();
-        String url = "mobile/oa/ saveAndSubmitMobileSignCard.action";
+        String url = "mobile/oa/saveAndSubmitMobileSignCard.action";
         Map<String, Object> param = new HashMap<>();
         param.put("caller", caller);
         Map<String, Object> params = new HashMap<>();