Merge branch 'dev'

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

@@ -94,6 +94,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/blindBoxItem/all").permitAll()
                 .antMatchers("/collection/recommend").permitAll()
                 .antMatchers("/order/**/status").permitAll()
+                .antMatchers("/activity/all").permitAll()
+                .antMatchers("/activity/get/*").permitAll()
                 // all other requests need to be authenticated
                 .anyRequest().authenticated().and()
                 // make sure we use stateless session; session won't be used to

src/main/java/com/izouma/nineth/service/AssetService.java

@@ -249,7 +249,7 @@ public class AssetService {
         collectionRepo.delete(collection);
 
         asset.setPublicShow(false);
-        asset.setCollectionId(null);
+        asset.setPublicCollectionId(null);
         assetRepo.save(asset);
     }