diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index 296777c..ff2c4d5 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -125,7 +125,7 @@ public class Project { @Column(name = "huazhi_product_amount") private BigDecimal huazhiProductAmount; /** - *紫光其他产品金额 + *其他产品金额 */ @Column(name = "ziguang_other_amount") private BigDecimal ziguangOtherAmount; diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index a279b1c..a0222a1 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -235,7 +235,7 @@
-
紫光其他产品金额
+
其他产品金额
${Utils.format(project.ziguangOtherAmount)}
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index 90beeaa..ecea88d 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -180,9 +180,9 @@
-
紫光其他产品金额
+
其他产品金额
-