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

admin

2019-08-05 35c25585cf6fea9e29574a75a03c57381cbe19e1

 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java

@@ -87,4 +87,22 @@
    */

   public TaoBaoOrder selectByPrimaryKey(Long id);



   /**

    * 根据结算时间检索

    * 
    * @param page

    * @param pageSize

    * @return

    */

   public List<TaoBaoOrder> listBySettlementTime(Long minTime, Long maxTime, int page, int pageSize);



   /**

    * 根据结算时间计数

    * 
    * @param minTime

    * @param maxTime

    * @return

    */

   public Long countBySettlementTime(Long minTime, Long maxTime);



}