Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-06 39ef464a6630a7b2ab99069e3f6bd40a99c48086

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

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