记得上下班打卡 | git大法好,push需谨慎

Commit 959489e0 authored by 胡佳晨's avatar 胡佳晨

Merge branch 'dev' into test

parents b66940ed 07032d64
...@@ -97,6 +97,8 @@ public class KylinPerformanceVo { ...@@ -97,6 +97,8 @@ public class KylinPerformanceVo {
private String message; private String message;
@ApiModelProperty(value = "演出公告") @ApiModelProperty(value = "演出公告")
private String notice; private String notice;
@ApiModelProperty(value = "是否显示")
private Integer isShow;
@ApiModelProperty(value = "场次") @ApiModelProperty(value = "场次")
private List<KylinTicketTimesVo> ticketTimeList; private List<KylinTicketTimesVo> ticketTimeList;
...@@ -142,6 +144,7 @@ public class KylinPerformanceVo { ...@@ -142,6 +144,7 @@ public class KylinPerformanceVo {
this.limitCount = performanceStatus.getLimitCount(); this.limitCount = performanceStatus.getLimitCount();
this.limitCountMember = performanceStatus.getLimitCountMember(); this.limitCountMember = performanceStatus.getLimitCountMember();
this.sysDamai = performanceStatus.getSyncDamai(); this.sysDamai = performanceStatus.getSyncDamai();
this.isShow=performanceStatus.getIsShow();
} }
public void setPerformanceRelations(KylinPerformanceRelations performanceRelations) { public void setPerformanceRelations(KylinPerformanceRelations performanceRelations) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment