From c48ecad4633a6624fec92e42ecd9eeca488a636c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 06 三月 2025 13:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
index 62c6668..f074175 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TInvoice;
import com.ruoyi.system.query.TInvoiceQuery;
@@ -48,12 +49,13 @@
@ApiOperation(value = "关联账单信息")
@GetMapping(value = "/getBillByInvoiceId/{invoiceId}")
- public R<PageInfo<TBill>> getBillByInvoiceId(@PathVariable String invoiceId){
+ public R<PageInfo<TBillDto>> getBillByInvoiceId(@PathVariable String invoiceId){
return R.ok(tBillService.getBillByInvoiceId(invoiceId));
}
@ApiOperation(value = "上传开票凭证")
@PostMapping("/uploadVoucher")
+ @PreAuthorize("@ss.hasPermi('invoice:list:payment')")
public R<Boolean> uploadVoucher(@RequestBody TInvoiceQuery query) {
TInvoice tInvoice = new TInvoice();
tInvoice.setId(query.getId());
--
Gitblit v1.7.1