From efb2457e0f7b6e5a76999c239d8b079b21c88eb0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 19 二月 2025 14:03:43 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 10cd917..5a781f8 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
@@ -47,8 +47,8 @@
}
@ApiOperation(value = "关联账单信息")
- @GetMapping(value = "/getBillByInvoiceId")
- public R<PageInfo<TBill>> getBillByInvoiceId(String invoiceId){
+ @GetMapping(value = "/getBillByInvoiceId/{invoiceId}")
+ public R<PageInfo<TBill>> getBillByInvoiceId(@PathVariable String invoiceId){
return R.ok(tBillService.getBillByInvoiceId(invoiceId));
}
@@ -58,10 +58,10 @@
TInvoice tInvoice = new TInvoice();
tInvoice.setId(query.getId());
tInvoice.setInvoiceVoucher(query.getInvoiceVoucher());
+ tInvoice.setInvoiceVoucherName(query.getInvoiceVoucherName());
tInvoice.setInvoiceTime(query.getInvoiceTime());
tInvoice.setStatus(2);
return R.ok(invoiceService.updateById(tInvoice));
}
-
}
--
Gitblit v1.7.1