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

935090232@qq.com

2022-01-24 4915156f5e5b321a48eba19746bbcc740f34a881

 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);


}