Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-10-14 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoOrderServiceImpl.java

@@ -211,4 +211,9 @@
      return taoBaoOrderMapper.countBySettlementTime(minTime, maxTime);

   }



   @Override

   public List<TaoBaoOrder> listByStateAndCreateTime(String state, Date minCreateTime, Date maxCreateTime) {

      return taoBaoOrderMapper.listByStateAndCreateTime(state, minCreateTime.getTime(), maxCreateTime.getTime());

   }



}