Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into uu_v1.0

# Conflicts:
#	WeiChat/src/main/AndroidManifest.xml
#	app_core/message/build.gradle
#	settings.gradle

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/contanct/ContactsActivity.java

@@ -721,7 +721,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                                             tmodels.add(model);
                                         }
                                     }
-                                    if(UserRoleUtils.getUserRole().equals("1")){
+                                    if("1".equals(UserRoleUtils.getUserRole())){
                                         loadLocalContacts();
                                     }else{
                                         loadUASFriendsNet();