Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!722

mp-service/src/main/java/com/qs/mp/admin/domain/TicketBox.java

@@ -241,7 +241,7 @@ public class TicketBox implements Serializable {
   }
 
   @ApiModelProperty("分佣金额")
-  public BigDecimal saleCommPrice() {
+  public BigDecimal getSaleCommPrice() {
     if (Objects.isNull(this.saleCommRate) || Objects.isNull(this.salePrice)) {
       return BigDecimal.ZERO;
     }

mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketBoxListVO.java

@@ -86,6 +86,9 @@ public class TicketBoxListVO {
   @ApiModelProperty("盲票票面价格")
   private Integer facePrice;
 
+  @ApiModelProperty("盲票原价")
+  private Integer originPrice;
+
   /**
    * 盲票销售价格
    */
@@ -117,7 +120,7 @@ public class TicketBoxListVO {
   private Date onTime;
 
   @ApiModelProperty("分佣金额")
-  public BigDecimal saleCommPrice() {
+  public BigDecimal getSaleCommPrice() {
     if (Objects.isNull(this.saleCommRate) || Objects.isNull(this.salePrice)) {
       return BigDecimal.ZERO;
     }