代码冲突

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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

app_core/common/src/main/java/com/common/system/PermissionUtil.java

@@ -32,7 +32,7 @@ public class PermissionUtil {
 				}
 			}
 		} else {
-			return true;
+			return false;
 		}
 		return false;
 	}