Merge branch 'ty_fix' into score_shop

Helius

2021-11-17 85d05a766c2ec3cbcbfead95e9d31e6059df648a

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


}