Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-16 b962e10d0d5bc18f0e1b61097a9d398c2c190244

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

@@ -6,8 +6,10 @@
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.other.api.domain.Goods;
import com.ruoyi.other.api.domain.GoodsShop;
import com.ruoyi.other.api.vo.GetGoodsShopByGoodsIds;
import com.ruoyi.other.service.GoodsService;
import com.ruoyi.other.service.GoodsShopService;
import com.ruoyi.other.vo.ShopGoodsList;
import com.ruoyi.other.vo.ShopGoodsListVo;
@@ -31,6 +33,9 @@

   @Resource
   private GoodsShopService goodsShopService;

   @Resource
   private GoodsService goodsService;
   
   
   /**