Merge branch 'test/#2' into 'develop'

测试修改

See merge request o2oa/o2oa!1128

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/AppStyle.java

@@ -3,15 +3,14 @@ package com.x.base.core.project.config;
 import java.io.File;
 import java.util.TreeSet;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-
 import com.x.base.core.project.annotation.FieldDescribe;
-import com.x.base.core.project.config.Token.Oauth;
 import com.x.base.core.project.gson.GsonPropertyObject;
 import com.x.base.core.project.gson.XGsonBuilder;
 import com.x.base.core.project.tools.DefaultCharset;
 
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+
 public class AppStyle extends ConfigObject {
 
 	public static AppStyle defaultInstance() {
@@ -443,16 +442,16 @@ public class AppStyle extends ConfigObject {
 			return o;
 		}
 
-//		"id": 12,
-//	    "key": "",
-//	    "name": "脑图",
-//	    "enable": true,
-//	    "iOS": {
-//	      "category": "native",
-//	      "subcategory": "coding",
-//	      "storyboard": "flutter",
-//	      "vcname": ""
-//	    }
+		// "id": 12,
+		// "key": "",
+		// "name": "脑图",
+		// "enable": true,
+		// "iOS": {
+		// "category": "native",
+		// "subcategory": "coding",
+		// "storyboard": "flutter",
+		// "vcname": ""
+		// }
 
 		public static NativeApp nativeMindMap() {
 			NativeApp o = new NativeApp();