Merge branch 'dev_goblin' into pre

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistListArDto.java

@@ -13,6 +13,8 @@ public class SweetManualArtistListArDto implements Serializable, Cloneable {
 
     private static final long serialVersionUID = -5997109354033494326L;
 
+    @ApiModelProperty("电子手册关联id")
+    private String manualRelationId;
     @ApiModelProperty("艺人id")
     private String artistsId;
     @ApiModelProperty("艺人名称")

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetManualArtistsMapper.xml

@@ -81,7 +81,7 @@
         group by ss.stage_id;
     </select>
     <select id="getManualListAr" resultType="com.liquidnet.service.sweet.dto.SweetManualArtistListArDto">
-        select
+        select manual_relation_id,
         sa.`artists_id`,
         sa.`name`,
         sa.pinyin,