Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-19 17e2f65826b3b69871e45c88238e5c7317f7ecb7

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java

@@ -101,6 +101,6 @@

   @Override
   public IPage<GoodsBargainPrice> queryGoodsBargainPricePage(Page<GoodsBargainPrice> page, GoodsBargainPrice goodsBargainPrice) {
      return null;
      return this.baseMapper.queryGoodsBargainPricePage(page,goodsBargainPrice);
   }
}