Merge branch 'master' into div

admin

2019-07-17 67f311be5d75450de39ab8b25181c1c7dc11a151

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -1207,4 +1207,11 @@
      return commonOrderMapper.listBySourceTypeAndTradeId(sourceType, tradeId);

   }



   @Override

   public List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime,

         Long maxTime, int page, int pageSize) {

      return commonOrderMapper.listBySourceTypeAndStateAndThirdCrateTime(sourceType, state, minTime, maxTime,

            (page - 1) * pageSize, pageSize);

   }



}