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

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java

@@ -77,6 +77,9 @@

      if (record.getBeyondOrderNum() == null)
         record.setBeyondOrderNum(0);
		
      if(record.getTeamDividentsOrderNum()==null)
         record.setTeamDividentsOrderNum(0);
   }

   @Override