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

admin

2019-08-29 b99a10cff6b4c4d0965871be894fba8ba64605fc

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java

@@ -278,7 +278,15 @@
    * @param pageSize

    * @return

    */

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

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

         Long maxTime, int page, int pageSize);



   /**

    * 查询订单  -根据订单号

    * @param uid

    * @param orderNO

    * @return

    */

   public List<CommonOrder> getByOrderNo(Long uid, String orderNO);



}