Merge branch 'ty_fix' of http://120.27.238.55:7000/r/beauty-erp into ty_fix

Helius

2021-11-30 d4c997972509c2da06b1128086b1735597823d3f

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


}