Browse Source

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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/PlatLeaveAddActivity.java
#	WeiChat/version.properties
#	app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/adapter/ComDocGriddataOutAdapter.java
Bitliker 8 years ago
parent
commit
703967f4e5

+ 1 - 1
app_modular/apputils/src/main/res/values/strings.xml

@@ -4,5 +4,5 @@
     <string name="str_error_wechat_pay_fail">支付失败</string>
     <string name="str_error_wechat_pay_fail">支付失败</string>
     <string name="str_error_wechat_pay_cancel">支付已取消</string>
     <string name="str_error_wechat_pay_cancel">支付已取消</string>
     <string name="click_to"><u>点击前往</u></string>
     <string name="click_to"><u>点击前往</u></string>
-    <string name="administrators_phone"><u>0755-26996828</u></string>
+    <string name="administrators_phone"><u>13430818775</u></string>
 </resources>
 </resources>

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

@@ -235,7 +235,7 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
         if (TextUtils.isEmpty(appkey)) {
         if (TextUtils.isEmpty(appkey)) {
             remainRl.setVisibility(View.VISIBLE);
             remainRl.setVisibility(View.VISIBLE);
             mRefreshLayout.setVisibility(View.GONE);
             mRefreshLayout.setVisibility(View.GONE);
-            remainTag.setText("您的账号未开通商旅服务,请联系管理员");
+            remainTag.setText("您的账号未开通商旅服务,请联系负责人");
             remainTv.setText(R.string.administrators_phone);
             remainTv.setText(R.string.administrators_phone);
         } else {
         } else {
             remainRl.setVisibility(View.GONE);
             remainRl.setVisibility(View.GONE);