Merge remote-tracking branch 'origin/master'

admin

2019-01-10 02d8f36a2a51a2ffcacdb619bee34077da61b328

 fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java

@@ -29,7 +29,9 @@
    // 实际总数量

    private Integer totalCount;

    // 实际总付款

    private BigDecimal totalSettlement;

    private BigDecimal totalPayment;

    // 实际总结算

     private BigDecimal totalSettlement;

    // 红包类型：

    private Integer hongBaoType;

    // 订单总预估奖金

@@ -219,5 +221,13 @@
      this.orderOrigin = orderOrigin;

   }



   public BigDecimal getTotalPayment() {

      return totalPayment;

   }



   public void setTotalPayment(BigDecimal totalPayment) {

      this.totalPayment = totalPayment;

   }



    

}