fix

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -1,18 +1,5 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.Objects;
-import java.util.Optional;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -22,8 +9,18 @@ import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Objects;
+
 /**
  * 曲谱表
  * @author yzp
@@ -225,6 +222,13 @@ public class MusicSheet implements Serializable {
 	@ApiModelProperty("曲目配置信息")
 	private String extConfigJson;
 
+	@TableField("first_tone_")
+	@ApiModelProperty("首调")
+	private String firstTone;
+
+	@TableField("fixed_tone_")
+	@ApiModelProperty("固定调")
+	private String fixedTone;
 
 	@TableField("del_flag_")
 	@ApiModelProperty(value = "假删除标识 0：未删除 1：已删除")
@@ -586,6 +590,22 @@ public class MusicSheet implements Serializable {
 		this.paymentType = paymentType;
 	}
 
+	public String getFirstTone() {
+		return firstTone;
+	}
+
+	public void setFirstTone(String firstTone) {
+		this.firstTone = firstTone;
+	}
+
+	public String getFixedTone() {
+		return fixedTone;
+	}
+
+	public void setFixedTone(String fixedTone) {
+		this.fixedTone = fixedTone;
+	}
+
 	public MusicSheet notation(YesOrNoEnum notation) {
 		this.notation = notation;
 		return this;

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -75,6 +75,8 @@
         t.submit_audit_time_ as submitAuditTime,
         t.accompaniment_type_ as accompanimentType,
         t.remark_ as remark,
+        t.first_tone_ as firstTone,
+        t.fixed_tone_ as fixedTone,
         t.title_img_ as titleImg,
         t.reason_ as reason,
         t.music_img_ as musicImg,