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

935090232@qq.com

2021-11-30 6cf7e063aa0c486c81beb6ed89386b501ad879f1

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


}