Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-26 fd2823afc771def7f9ea1f09d9c38ea8086aa395

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsShopService.java

@@ -1,6 +1,7 @@
package com.ruoyi.other.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.GoodsShop;
import com.ruoyi.other.vo.ShopGoodsList;
import com.ruoyi.other.vo.ShopGoodsListVo;
@@ -22,5 +23,5 @@
    * @param shopGoodsListVo
    * @return
    */
   List<ShopGoodsList> getShopGoodsList(ShopGoodsListVo shopGoodsListVo);
   PageInfo<ShopGoodsList> getShopGoodsList(ShopGoodsListVo shopGoodsListVo);
}