Merge branch 'dev' into test

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinPerformancesPartnerServiceImpl.java

@@ -604,7 +604,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             // 排序 分页
             Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"));
             //条件
-            Criteria criteria = Criteria.where("status").is(status).and("isCreateSave").is(1);
+            Criteria criteria = Criteria.where("status").is(status).and("isCreateSave").is(1).and("merchantId").is(performancePartnerListParam.getMerchantId());
             if (!performancePartnerListParam.getTitle().isEmpty()) {
                 criteria.and("title").regex(".*?\\" + performancePartnerListParam.getTitle());
             }

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

@@ -19,6 +19,10 @@ public class SweetManualArtistListDto implements Serializable,Cloneable {
     private String name;
     @ApiModelProperty("拼音")
     private String pinyin;
+    @ApiModelProperty("简介")
+    private String describes;
+    @ApiModelProperty("头像图片")
+    private String picUrl;
     @ApiModelProperty("舞台id")
     private String stageId;
     @ApiModelProperty("舞台名称")

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

@@ -7,6 +7,8 @@
         <result column="artists_id" property="artistId"/>
         <result column="name" property="name"/>
         <result column="pinyin" property="pinyin"/>
+        <result column="describes" property="describes"/>
+        <result column="pic_url" property="picUrl"/>
         <result column="stage_id" property="stageId"/>
         <result column="title" property="title"/>
         <result column="performance_start" property="performanceStart"/>
@@ -24,6 +26,8 @@
         sa.`artists_id`,
         sa.`name`,
         sa.pinyin,
+        sa.describes,
+        sa.pic_url,
         ss.stage_id,
         ss.title,
         performance_start,