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

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

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

@@ -358,5 +358,14 @@
      return count;
   }
   
   @Override
   public long countHistoryOrderNum(Long uid) {
      Long count = commonOrderCountMapper.countHistoryOrderNum(uid);
      if (count  == null) {
         count = 0L;
      }
      return count;
   }
	
   
}