Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -221,7 +221,6 @@
   public List<Map<String, Object>> countWeiQaunOrderNumber(Integer dateType, String year, String startTime,

         String endTime) throws Exception{

      return taoBaoWeiQuanOrderMapper.countWeiQaunOrderNumber(dateType, year, startTime, endTime);

		
   }

   

   @Override