Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-16 6e936cc4af80fa65210d7e00a54e89a9e706305d

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/GoodsShopMapper.java

@@ -2,6 +2,11 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.other.api.domain.GoodsShop;
import com.ruoyi.other.vo.ShopGoodsList;
import com.ruoyi.other.vo.ShopGoodsListVo;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -12,5 +17,17 @@
 * @since 2024-11-20
 */
public interface GoodsShopMapper extends BaseMapper<GoodsShop> {

	
	
   /**
    * 获取门店授权的服务商品
    * @param shopId
    * @param goodsId
    * @param goodsName
    * @param goodsCategoryId
    * @return
    */
   List<ShopGoodsList> getShopGoodsList(@Param("shopId") Integer shopId, @Param("goodsId") String goodsId,
                                        @Param("goodsName") String goodsName, @Param("goodsCategoryId") Integer goodsCategoryId);
	
}