From 49e4e03584a649114ac1b339a4d7116b2ee237f6 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Wed, 8 Dec 2021 16:21:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=84=8F=E8=A7=81?=
=?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=BF=85=E5=A1=AB=E6=A0=87=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/templates/admin/project_approve.ftl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index e1008e1..f9b2b00 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -1849,7 +1849,7 @@
From e6e3715a2de756e060d27a2901692d57fae9b31e Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Wed, 8 Dec 2021 16:33:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E6=88=90=E6=9C=AC=E6=98=8E?=
=?UTF-8?q?=E7=BB=86=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/templates/admin/project_budget_edit.ftl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index e84cf83..762068d 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -569,11 +569,11 @@
-->
<#if costProjectManageDetail.deletable==0>
<#if costProjectManageDetail.type ==1 >
- 人工成本
+
<#elseif costProjectManageDetail.type ==2>
- 业务费用
+
<#elseif costProjectManageDetail.type ==3>
- 其他费用
+
#if>
<#elseif costProjectManageDetail.deletable!=0>