Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

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

@@ -13,8 +13,6 @@ public class SweetManualArtistListArDto implements Serializable, Cloneable {
 
     private static final long serialVersionUID = -5997109354033494326L;
 
-    @ApiModelProperty("电子手册关联id")
-    private String manualRelationId;
     @ApiModelProperty("艺人id")
     private String artistsId;
     @ApiModelProperty("艺人名称")
@@ -41,7 +39,7 @@ public class SweetManualArtistListArDto implements Serializable, Cloneable {
     private String signatureStart;
     @ApiModelProperty("艺人签售结束")
     private String signatureEnd;
-    @ApiModelProperty("艺人资源url 目前是视频和图片")
+    @ApiModelProperty("艺人资源url 目前是视频和图片 轮播图使用")
     private List<SweetManualArtistResourceUrlArDto> resourceUrl;
 
     private static final SweetManualArtistListArDto obj = new SweetManualArtistListArDto();

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

@@ -7,5 +7,6 @@
         select url, type
         from sweet_artists_url
         where artists_id = #{artistsId}
+        order by type desc
     </select>
 </mapper>

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 manual_relation_id,
+        select
         sa.`artists_id`,
         sa.`name`,
         sa.pinyin,