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

admin

2020-02-26 a276635f2b82e5ee653275024d6211f7132df9a1

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

@@ -59,6 +59,11 @@
      return commonOrderCountMapper.countByState(state);

   }



   @Override
   public Integer countOderByUidAndLess10(Long uid) {
      return commonOrderCountMapper.countOderByUidAndLess10(uid);
   }

   public List<ChartTDO> dayFactory(String startTime, String endTime, List<ChartTDO> list) throws Exception {

      List<ChartTDO> listObject = new ArrayList<ChartTDO>();

      if (startTime.equals(endTime)) {