Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-18 3f8e43bb394301b7018a03d2d38e70e1232443d6

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

@@ -1,6 +1,8 @@
package com.ruoyi.other.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
@@ -96,4 +98,9 @@
      goodsBargainPriceDetailService.saveBatch(list);
      return R.ok();
   }

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