Merge branch 'div1'

yujian

2019-01-08 a79be5c75d4409bd14a36b648c1a398b409cad65

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

@@ -29,6 +29,8 @@
    // 实际总数量

    private Integer totalCount;

    // 实际总付款

    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;

   }



    

}