Merge branch 'dev' into 特权藏品

# Conflicts:
#	src/main/java/com/izouma/nineth/enums/CollectionSource.java

src/main/java/com/izouma/nineth/enums/CollectionSource.java

@@ -4,7 +4,7 @@ public enum CollectionSource {
     OFFICIAL("官方铸造"),
     USER("用户铸造"),
     TRANSFER("转让"),
-    COMPANY("企业");
+    COMPANY("企业铸造");
 
     private final String description;
 

src/main/java/com/izouma/nineth/security/WebSecurityConfig.java

@@ -84,6 +84,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/payOrder/**").permitAll()
                 .antMatchers("/notify/**").permitAll()
                 .antMatchers("/banner/all").permitAll()
+                .antMatchers("/setting/all").permitAll()
+                .antMatchers("/setting/byFlag").permitAll()
                 .antMatchers("/collection/all").permitAll()
                 .antMatchers("/collection/get/**").permitAll()
                 .antMatchers("/asset/get/**").permitAll()