From a5f8fdde3b6ef9224a92f39a4a2773ee60460d96 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期五, 28 二月 2025 16:02:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xizang-changyun' into xizang-changyun
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java | 3 ++-
1 files changed, 2 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 5a781f8..fd9b109 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,7 +49,7 @@
@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));
}
--
Gitblit v1.7.1