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

admin

2020-06-30 e40d1c22c7202aac843c66f9ee9cc000744f9e10

 fanli/src/main/java/com/yeshi/fanli/entity/admin/count/DailyCountCoupon.java

@@ -24,7 +24,10 @@
      welfareFreeCouponMoney("福利免单统计金额"), 
      freeCouponGiveNum("赠送免单券统计数量"),
      rebateCouponNum("返利奖励券统计数量"),
      rebateCouponMoney("返利奖励券统计金额");
      rebateCouponMoney("返利奖励券统计金额"),
      pullNewCouponNum("拉新免单券统计数量"),
      pullNewCouponMoney("拉新免单券统计金额");
		

      private final String desc;