合并代码

puzhibing

2024-12-24 7cddb7125f2095facea68c11068e269809ef4108

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsVipController.java

@@ -31,8 +31,8 @@
    * @return
    */
   @PostMapping("/getGoodsVip")
   public R<GoodsVip> getGoodsVip(@RequestParam("vip") Integer vip){
      GoodsVip one = goodsVipService.getOne(new LambdaQueryWrapper<GoodsVip>().eq(GoodsVip::getVip, vip));
   public R<GoodsVip> getGoodsVip(@RequestParam("goodsId") Integer goodsId, @RequestParam("vip") Integer vip){
      GoodsVip one = goodsVipService.getOne(new LambdaQueryWrapper<GoodsVip>().eq(GoodsVip::getGoodsId, goodsId).eq(GoodsVip::getVip, vip));
      return R.ok(one);
   }