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

admin

2020-04-27 9327346e9566ac44456ed91d371f702cc4fea982

 fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountOrderServiceImpl.java

@@ -296,7 +296,7 @@
    * @param typeEnum

    * @throws Exception

    */

   private void addChannelOrderMoney(String preDay, DailyCountOrderEnum typeEnum) throws Exception {

   public void addChannelOrderMoney(String preDay, DailyCountOrderEnum typeEnum) throws Exception {

      List<UserInfoRegister> listRegister = null;

      // 查询订单佣金

      List<CountOrderDTO> listOrder = commonOrderCountService.countCommissionByDay(preDay);