Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

8 天以前 a3c54410de03f0fd242e1a1118d6471300cf1eda

 src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java

@@ -12,7 +12,7 @@
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.service.SparePartsService;
import org.springframework.beans.factory.annotation.Autowired;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
@@ -22,12 +22,10 @@
import java.util.stream.Collectors;

@Service
@RequiredArgsConstructor
public class SparePartsServiceImpl extends ServiceImpl<SparePartsMapper, SpareParts> implements SparePartsService {
    @Autowired
    private SparePartsMapper sparePartsMapper;

    @Autowired
    private DeviceLedgerMapper deviceLedgerMapper;
    private final SparePartsMapper sparePartsMapper;
    private final DeviceLedgerMapper deviceLedgerMapper;

    @Override
    public IPage<SparePartsDto> listPage(Page page, SpareParts spareParts) {