Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-19 ef8ec1ea5e2948309d5ee20817d1b28785957923

 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);
   }
}