Merge remote-tracking branch 'origin/master'

phpcjl

2024-11-28 a6969927746626d3dc89a9bea6c8e0515ba7de4a

 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);
    List<Goods> selectListByShopId(Integer shopId, String vip);
}