测试

.idea/encodings.xml

@@ -2,8 +2,12 @@
 <project version="4">
   <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java/com/yc/education/model/ActivityNews.java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java/com/yc/education/model/ActivityTag.java" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/src/main/java/com/yc/education/model/ActivityType.java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java/com/yc/education/model/OwnerService.java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java/com/yc/education/model/OwnerServiceType.java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/webapp/static/admin/js/area.js" charset="GBK" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>

src/main/java/com/yc/education/controller/admin/BrandAdminController.java

@@ -343,7 +343,7 @@ public class BrandAdminController {
                     brand.setModifiedDate(new Date());
                     brand.setPrefix(PinYin2Abbreviation.cn2py(brand.getName().substring(0, 1)).toUpperCase());//设置品牌首字母
                     list.add(brand);
-
+                    // 主分支
                 }
             }
         }else{