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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -86,7 +86,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 String phone = CommonUtil.getSharedPreferences(getActivity(), "user_phone");
                 String password = CommonUtil.getSharedPreferences(getActivity(), "user_password");
                 String url = "http://www.ubtob.com/signin#/redirect/" + phone + "/" + password;
-                ViewUtil.WebLinks(ct, url, "优软商务");
+                ViewUtil.WebLinks(ct, url, "我的商务");
                 break;
             case R.id.rl_uas_sys:
                 ct.startActivity(new Intent(ct, ErpMenActivity.class));

WeiChat/src/main/res/values/strings.xml

@@ -231,7 +231,6 @@
     <string name="circle_select_image">选择图片，最多9个</string>
     <string name="circle_select_video">选择视频，最多1个</string>
     <string name="circle_add_video">添加视频</string>
-
     <!-- 消息详情界面 -->
     <string name="message_detail">说说详情</string>
     <string name="comment_count">评论数(<xliff:g id="count">%1$d</xliff:g>)</string>