Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

zyx

2023-12-04 fdf2903b8944b80877e7df5d0da38f34b5d84ed9

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

}