Merge remote-tracking branch 'origin/master'

xuhy

2025-01-15 dc6e870c25c9e4debc54e844544f447dc7bcfbac

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java

@@ -371,7 +371,7 @@

         Goods goods1 = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
         if(null != goods1.getPurchaseLimit() && -1 != goods1.getPurchaseLimit() && goods1.getPurchaseLimit() < setGoodsNumber.getNumber()){
//            return R.fail("修改数量不能大于限购数量");
            return R.fail("修改数量不能大于限购数量");
         }

         shoppingCart.setNumber(setGoodsNumber.getNumber());