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

云

2026-04-23 a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488

 src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java

@@ -16,12 +16,12 @@
import com.ruoyi.project.system.mapper.SysUserMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;

@@ -32,16 +32,12 @@
@RestController
@Api(tags = "计量器具台账")
@RequestMapping("/measuringInstrumentLedger")
@AllArgsConstructor
public class MeasuringInstrumentLedgerController extends BaseController {

    @Autowired
    private MeasuringInstrumentLedgerService measuringInstrumentLedgerService;

    @Autowired
    private SysUserMapper sysUserMapper;

    @Autowired
    private MeasuringInstrumentLedgerRecordMapper measuringInstrumentLedgerRecordMapper;
    private final MeasuringInstrumentLedgerService measuringInstrumentLedgerService;
    private final SysUserMapper sysUserMapper;
    private final MeasuringInstrumentLedgerRecordMapper measuringInstrumentLedgerRecordMapper;


    @GetMapping("/listPage")