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

admin

2019-11-06 4d7db6fd66f5b2c9cae9954e46314f9711ce1e8f

 fanli/src/main/java/com/yeshi/fanli/service/inter/shop/BanLiShopOrderService.java

@@ -101,5 +101,12 @@
    * @param order

    */

   public void udpateSelectiveByPrimaryKey(BanLiShopOrder order);

	
   /**

    * 根据订单号查询

    * @param orderNo

    * @return

    */

   public BanLiShopOrder selectByOrderNo(String orderNo);



}