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

alien-entity/src/main/java/shop/alien/entity/store/LifeNotice.java

@@ -30,6 +30,7 @@ public class LifeNotice {
     private Integer businessId;
 
     @ApiModelProperty(value = "标题")
+    @TableField("title")
     private String title;
 
     @ApiModelProperty(value = "公告内容")

alien-store/src/main/java/shop/alien/store/service/impl/PerformanceListServiceImpl.java

@@ -225,8 +225,8 @@ public class PerformanceListServiceImpl implements PerformanceListService {
         vo.setPerformancePoster(performance.getPerformancePoster());
         vo.setPerformanceType(performance.getPerformanceType());
 
-        // 设置演出者信息
-        vo.setPerformersInfo(buildPerformersInfo(performance.getStaffConfigIds()));
+        // 设置演出者信息（过滤下线演出人员）
+        vo.setPerformersInfo(buildPerformersInfoFilterOffline(performance.getStaffConfigIds()));
 
         // 设置日期范围
         vo.setDateRange(buildDateRange(performance));
@@ -237,8 +237,8 @@ public class PerformanceListServiceImpl implements PerformanceListService {
         // 设置演出风格（直接返回表中的值，不查询字典）
         vo.setPerformanceStyle(performance.getPerformanceStyle());
 
-        // 设置演出人员头像列表
-        vo.setStaffImageList(queryStaffImageList(performance.getStaffConfigIds()));
+        // 设置演出人员头像列表（过滤下线演出人员）
+        vo.setStaffImageList(queryStaffImageListFilterOffline(performance.getStaffConfigIds()));
 
         return vo;
     }