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

935090232@qq.com

2021-10-25 7af9aaa4ef6736d407cc3cbe03beddb8dfd57fe9

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopOrderDao.java

@@ -74,5 +74,7 @@

   public int batchUpdateOrderStatus(@Param("list") List<ShopOrder> list);

   public ShopOrder selectShopOrderByOrderNo(@Param("orderNo")String orderNo);


}