From ecd6e50d0bb2c74e4b3f7a23e0d44f5e001987ea Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 13:57:47 +0800
Subject: [PATCH] 冲突解决
---
src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
index 761b39e..96e0388 100644
--- a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
+++ b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
@@ -10,6 +10,7 @@
sl.sales_contract_no AS customerContractNo,
sl.customer_name,
sl.contract_amount AS contract_amount,
+ sl.project_name,
SUM( pl.contract_amount ) AS purchase_amount,
(
sl.contract_amount - SUM( pl.contract_amount )) AS balance,
--
Gitblit v1.9.3