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

admin

2020-06-29 48934b8c3da5a6791d0805ff0c1d327da834cc2d

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

@@ -303,6 +303,15 @@
    * @return
    */
   List<CommonOrder> getByOrderNo(@Param("uid") Long uid, @Param("orderNo") String orderNo);
	
   /**
    * 根据订单号查询
    * 
    * @param orderNO
    * @return
    */
   List<CommonOrder> getByOrderNoAndSourceType(@Param("uid") Long uid, @Param("orderNo") String orderNo,
         @Param("sourceType") int sourceType);

   
   /**