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

admin

2019-08-28 52c6d1a36c708d5047ca7b44a418c00793b90a73

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java

@@ -270,4 +270,13 @@
   List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(@Param("sourceType") int sourceType,
         @Param("state") Integer state, @Param("minTime") Long minTime, @Param("maxTime") Long maxTime,
         @Param("start") long start, @Param("count") int count);
	
	
   /**

    * 根据订单号查询

    * @param orderNO

    * @return

    */

   List<CommonOrder> getByOrderNo(@Param("uid") Long uid, @Param("orderNo") String orderNo);



}