Merge remote-tracking branch 'origin/test-merge' into test-merge

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/AlbumController.java

@@ -158,8 +158,8 @@ public class AlbumController extends BladeController {
             throw new ServiceException("相册不能为空");
         }
         Album album = new Album();
-        album.setId(SnowFlakeUtil.getId());
         BeanUtil.copy(albumDTO, album);
+        album.setId(SnowFlakeUtil.getId());
         String dateValue = albumDTO.getDateValue();
         String[] strings = dateValue.split("~");
         album.setStartDate(strings[0]);