Merge remote-tracking branch 'origin/div' into div

admin

2020-05-21 49ed4f4521ce433a14810a0119bf3f2f7f6e606a

 fanli/src/main/java/com/yeshi/fanli/entity/order/OrderMoneyDailyCount.java

@@ -80,6 +80,16 @@
   private Integer inDirectOrderNum;// 间接订单数量

   @Field

   private Integer beyondOrderNum;// 二级外订单数量

	
	
   public OrderMoneyDailyCount() {}

	
   public OrderMoneyDailyCount(Integer directOrderNum, Integer inDirectOrderNum, Integer beyondOrderNum) {

      this.directOrderNum = directOrderNum;

      this.inDirectOrderNum = inDirectOrderNum;

      this.beyondOrderNum = beyondOrderNum;

   }

	


   public Integer getDirectOrderNum() {

      return directOrderNum;