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

admin

2020-06-30 e40d1c22c7202aac843c66f9ee9cc000744f9e10

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

@@ -480,4 +480,20 @@
    */
   public List<CommonOrder> listByOrderNo(String orderNo);

   /**
    * 根据订单类型+ 订单号查询
    * @param uid
    * @param orderNO
    * @param sourceType
    * @return
    */
   public List<CommonOrder> getByOrderNoAndSourceType(Long uid, String orderNO, int sourceType);

   /**
    * 首单
    * @param uid
    * @return
    */
   public CommonOrder getFirstOrder(Long uid);

}