From da9bd3cf79a9038e1334cca7cd9efb01f2245151 Mon Sep 17 00:00:00 2001
From: pikaqiudeshujia <pikaqiudeshujia@gmail.com>
Date: Mon, 29 Apr 2024 09:10:24 +0800
Subject: [PATCH] =?UTF-8?q?release-=E4=B8=93=E8=BE=91=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E6=94=B6=E8=B4=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../luoo/music/dto/response/AlbumUpdateDTO.java    | 14 +++++++++++++-
 .../main/java/com/luoo/music/pojo/ArtistAlbum.java |  3 +++
 luoo_music/src/main/resources/sql/20240429.sql     |  3 +++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 luoo_music/src/main/resources/sql/20240429.sql

diff --git a/luoo_music/src/main/java/com/luoo/music/dto/response/AlbumUpdateDTO.java b/luoo_music/src/main/java/com/luoo/music/dto/response/AlbumUpdateDTO.java
index 427ff62..13c3d34 100644
--- a/luoo_music/src/main/java/com/luoo/music/dto/response/AlbumUpdateDTO.java
+++ b/luoo_music/src/main/java/com/luoo/music/dto/response/AlbumUpdateDTO.java
@@ -6,7 +6,6 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @Author: yawei.huang
@@ -30,34 +29,40 @@ public class AlbumUpdateDTO implements Serializable {
     @ApiModelProperty("专辑名称")
     @NotNull(message = "专辑名称不能为空")
     private String name;
+
     /**
      * 专辑封面
      */
     @ApiModelProperty("专辑封面")
     @NotNull(message = "专辑封面不能为空")
     private String image;
+
     /**
      * 专辑版本
      */
     @ApiModelProperty("专辑版本")
     private Integer version;
+
     /**
      * 发行日期
      */
     @ApiModelProperty("发行日期")
     private Date publishDate;
+
     /**
      * 主要风格
      */
     @ApiModelProperty("主要风格")
     @NotNull(message = "主要风格不能为空")
     private String mainStyle;
+
     /**
      * 次要风格
      */
     @NotNull(message = "次要风格不能为空")
     @ApiModelProperty("次要风格")
     private String subStyle;
+
     /**
      * 专辑条码
      */
@@ -74,11 +79,18 @@ public class AlbumUpdateDTO implements Serializable {
      */
     @ApiModelProperty("音乐人id")
     private String artistId;
+
     /**
      * 音乐人昵称
      */
     @ApiModelProperty("音乐人昵称")
     private String artistName;
 
+    /**
+     * 收费类型 1-下载 2-试听及下载
+     */
+    @ApiModelProperty("收费类型 1-下载 2-试听及下载")
+    private Integer chargeType;
+
 
 }
diff --git a/luoo_music/src/main/java/com/luoo/music/pojo/ArtistAlbum.java b/luoo_music/src/main/java/com/luoo/music/pojo/ArtistAlbum.java
index f94f83e..e0d5bf0 100644
--- a/luoo_music/src/main/java/com/luoo/music/pojo/ArtistAlbum.java
+++ b/luoo_music/src/main/java/com/luoo/music/pojo/ArtistAlbum.java
@@ -116,6 +116,9 @@ public class ArtistAlbum implements Serializable {
     @ApiModelProperty("修改人")
     private String updateUser;
 
+    @ApiModelProperty("收费类型 1-下载 2-试听及下载")
+    private Integer chargeType;
+
     @Transient
     @ApiModelProperty("专辑歌曲绑定关系")
     private List<SongInfo> songList;
diff --git a/luoo_music/src/main/resources/sql/20240429.sql b/luoo_music/src/main/resources/sql/20240429.sql
new file mode 100644
index 0000000..55d9ca7
--- /dev/null
+++ b/luoo_music/src/main/resources/sql/20240429.sql
@@ -0,0 +1,3 @@
+alter table tb_artist_album
+    add charge_type int null comment '收费类型 1-下载 2-试听及下载';
+