Эх сурвалжийг харах

Merge branch 'BugFix-panzhilin' into sit

panzhilin 2 сар өмнө
parent
commit
c8ebfed8ef

+ 6 - 0
alien-entity/src/main/java/shop/alien/entity/store/vo/PerformerVo.java

@@ -43,5 +43,11 @@ public class PerformerVo implements Serializable {
      */
     @ApiModelProperty(value = "职位")
     private String style;
+
+    /**
+     * 标签(对应 store_staff_config.tag)
+     */
+    @ApiModelProperty(value = "标签")
+    private String tag;
 }
 

+ 1 - 0
alien-store/src/main/java/shop/alien/store/service/impl/BarPerformanceServiceImpl.java

@@ -534,6 +534,7 @@ public class BarPerformanceServiceImpl implements BarPerformanceService {
         performerVo.setAvatar(staffConfig.getStaffImage());
         performerVo.setName(staffConfig.getName());
         performerVo.setStyle(staffConfig.getStaffPosition());
+        performerVo.setTag(staffConfig.getTag());
         return performerVo;
     }