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

whycq

2024-04-10 2832d39ad91a6de161bf9b8f8e3307bf6bc7fb65

 src/main/java/com/zy/common/service/erp/ErpController.java

@@ -27,9 +27,9 @@
        return R.ok().add(erpService.selectVoucher(0));
    }

    @GetMapping("/voucherDetail/list")
    public R voucherDetailList() {
        return R.ok().add(erpService.selectVoucherDetail(0));
    }
//    @GetMapping("/voucherDetail/list")
//    public R voucherDetailList() {
//        return R.ok().add(erpService.selectVoucherDetail(0));
//    }

}