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

yujian

2020-05-26 022c492fe0645af7761889f6471e3e2ae5751fb6

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

@@ -75,21 +75,22 @@
   @Field

   private Integer teamSubsidyNum; // 团队补贴订单数量

   @Field

   private Integer teamDividentsOrderNum;// 参与分红的订单数量

   @Field

   private Integer directOrderNum;// 直接订单数量

   @Field

   private Integer inDirectOrderNum;// 间接订单数量

   @Field

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

   

	
   public OrderMoneyDailyCount() {}

   public OrderMoneyDailyCount() {

   }

   

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

      this.directOrderNum = directOrderNum;

      this.inDirectOrderNum = inDirectOrderNum;

      this.beyondOrderNum = beyondOrderNum;

   }

	


   public Integer getDirectOrderNum() {

      return directOrderNum;

@@ -230,4 +231,12 @@
      this.updateTime = updateTime;

   }



   public Integer getTeamDividentsOrderNum() {

      return teamDividentsOrderNum;

   }



   public void setTeamDividentsOrderNum(Integer teamDividentsOrderNum) {

      this.teamDividentsOrderNum = teamDividentsOrderNum;

   }



}