Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 8ca8432f7dfb2c58ff6c0f9d1f7224b262bdaba4

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.other.api.domain.Goods;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -14,5 +15,5 @@
 * @since 2024-11-20
 */
public interface GoodsMapper extends BaseMapper<Goods> {
    List<Goods> selectListByShopId(Integer shopId, Integer vip);
    List<Goods> selectListByShopId(@Param("shopId") Integer shopId,@Param("vip") Integer vip);
}