From 35a2135d5800e2c6bad631993d06cf1e37e9cd49 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Thu, 21 Jul 2022 14:34:18 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=87=91=E9=A2=9D0.00?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/palmte/work/service/ProjectService.java | 1 + src/main/resources/templates/admin/project_list.ftl | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index 9014abc..a89ed4b 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -181,6 +181,7 @@ public class ProjectService { //只有如下可以修改 projectInDb.setName(project.getName()); + projectInDb.setProjectNo(project.getProjectNo()); projectInDb.setCustomer(project.getCustomer()); projectInDb.setTerminalCustomer(project.getTerminalCustomer()); projectInDb.setIndustryScenario(project.getIndustryScenario()); diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index e19bd5f..cfd99d5 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -200,9 +200,9 @@ ${list.projectNo!} ${list.name!} ${list.typeDesc!} - ${list.contractAmount!} - ${list.huazhiProductAmount!} - ${list.ziguangOtherAmount!} + ${Utils.format(list.contractAmount, "0.00")} + ${Utils.format(list.huazhiProductAmount, "0.00")} + ${Utils.format(list.ziguangOtherAmount, "0.00")} ${list.statusDesc!} ${list.approveStatusDesc!} ${list.approveName!} From b70b05852ef28a2459f18e1252c5485d8bf0607a Mon Sep 17 00:00:00 2001 From: OathK1per Date: Thu, 21 Jul 2022 15:02:26 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Utils=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/palmte/work/controller/backend/ProjectController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 95917c3..5910036 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -96,6 +96,7 @@ public class ProjectController extends BaseController { } } model.put("pager", page); + model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils")); /// /*Page myApproveProjects = projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), 1, Integer.MAX_VALUE); model.put("hasApproveProjects", CollectionUtil.isNotEmpty(myApproveProjects.getList()) ? "1" : "0");*/ From c67db730fae581a5618a9019286f929f4d18f2c7 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Thu, 21 Jul 2022 15:51:01 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E4=B8=BAnull=E7=9A=84=E5=A4=84=E7=90=86?= 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 fb2e47c..e5b4b57 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -164,7 +164,7 @@
<#----> - +
From 336673507325bb7b0631b9f0707bfaafb59f02b7 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Thu, 21 Jul 2022 16:14:13 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E4=B8=BAnull=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/admin/project_budget_edit.ftl | 10 +++++++++- .../templates/admin/project_estimate_edit.ftl | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index b5df41e..e7176b9 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -92,7 +92,15 @@
- +
+
*项目编号
+
+ +
+
+
*项目名称
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index 700657d..313f67d 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -67,7 +67,7 @@
+ value="${project.projectNo!}" required />
From f25c4c67594944391d49676d58a643dfbf9b242c Mon Sep 17 00:00:00 2001 From: OathK1per Date: Fri, 22 Jul 2022 10:20:26 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palmte/work/controller/backend/ProjectController.java | 1 + .../resources/templates/admin/project_list_approve.ftl | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 5910036..dec68cd 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -369,6 +369,7 @@ public class ProjectController extends BaseController { model.put("deptList", deptService.findAll()); ConcurrentHashMap searchInfo = getSearchInfo(keywords, model); model.put("pager", projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pageNumber, pageSize)); + model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils")); return "admin/project_list_approve"; } diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl index cc875ff..935bddc 100644 --- a/src/main/resources/templates/admin/project_list_approve.ftl +++ b/src/main/resources/templates/admin/project_list_approve.ftl @@ -174,8 +174,12 @@ 序号 + 项目编号 项目名称 项目类型 + 项目合同金额 + 华智产品金额 + 其他产品金额 项目状态 审核状态 当前审核人 @@ -190,8 +194,12 @@ <#list pager.list as list> ${list.id!} + ${list.projectNo!} ${list.name!} ${list.typeDesc!} + ${Utils.format(list.contractAmount, "0.00")} + ${Utils.format(list.huazhiProductAmount, "0.00")} + ${Utils.format(list.ziguangOtherAmount, "0.00")} ${list.statusDesc!} ${list.approveStatusDesc!} ${list.approveName!} From 7b2b5324a68fd5cd599f18321663bd5e17ad48ff Mon Sep 17 00:00:00 2001 From: OathK1per Date: Fri, 22 Jul 2022 16:43:38 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E9=99=90=E5=88=B6?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/admin/project_list.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 72ba7e2..63e439c 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -382,7 +382,7 @@
- +
From 094017d0d78e996e093cc3170fd3c1abca9538b7 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Fri, 22 Jul 2022 16:50:33 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/admin/project_list.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 63e439c..dea5e69 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -197,7 +197,7 @@ <#list pager.list as list> ${list.tempId!} - ${list.projectNo!} + ${list.projectNo!} ${list.name!} ${list.typeDesc!} ${Utils.format(list.contractAmount, "0.00")} From e7a93593e060af6ce188486d2f41743b3a702024 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Fri, 22 Jul 2022 17:36:35 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 8 ++--- .../java/cn/palmte/work/model/Project.java | 33 +++++++++++++++++++ .../palmte/work/service/ProjectService.java | 2 +- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index dec68cd..d33fa30 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -110,8 +110,8 @@ public class ProjectController extends BaseController { public void export(@RequestParam(value = "keywords", required = false) String keywords, HttpServletResponse httpServletResponse) throws IOException { Map searchInfo = getSearchInfo(keywords); downloadHeader(httpServletResponse, Utils.generateExcelName("项目报表"), "application/octet-stream"); - String[] headers = {"项目名称", "项目类型", "项目状态", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"}; - String[] exportColumns = {"name", "typeDesc", "statusDesc", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDateYM", "endDateYM", "lastUpdateTime"}; + String[] headers = {"项目编号", "项目名称", "项目类型", "项目合同金额", "华智产品金额", "其他产品金额", "项目状态", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"}; + String[] exportColumns = {"projectNo", "name", "typeDesc", "contractRound", "huazhiRound", "ziguangRound", "statusDesc", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDateYM", "endDateYM", "lastUpdateTime"}; ExportUtils.exportToExcel(headers, exportColumns, 1, 10000, httpServletResponse.getOutputStream(), (pN, pS) -> projectService.list(searchInfo, pN, pS).getList()); } @@ -380,8 +380,8 @@ public class ProjectController extends BaseController { public void exportApprove(@RequestParam(value = "keywords", required = false) String keywords, HttpServletResponse httpServletResponse) throws IOException { Map searchInfo = getSearchInfo(keywords); downloadHeader(httpServletResponse, Utils.generateExcelName("待我审核项目报表"), "application/octet-stream"); - String[] headers = {"项目名称", "项目类型", "项目状态", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"}; - String[] exportColumns = {"name", "typeDesc", "statusDesc", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDate", "endDate", "lastUpdateTime"}; + String[] headers = {"项目编号", "项目名称", "项目类型", "项目合同金额", "华智产品金额", "其他产品金额", "项目状态", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"}; + String[] exportColumns = {"projectNo", "name", "typeDesc", "contractRound", "huazhiRound", "ziguangRound", "statusDesc", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDate", "endDate", "lastUpdateTime"}; ExportUtils.exportToExcel(headers, exportColumns, 1, 10000, httpServletResponse.getOutputStream(), (pN, pS) -> projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pN, pS).getList()); } diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index 07667f6..db8abf1 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -182,6 +182,15 @@ public class Project { @Column(name = "plan_end_str") private String planEndStr; + @Transient + private BigDecimal contractRound; + + @Transient + private BigDecimal huazhiRound; + + @Transient + private BigDecimal ziguangRound; + public int getId() { return id; } @@ -501,4 +510,28 @@ public class Project { public void setPlanEndStr(String planEndStr) { this.planEndStr = planEndStr; } + + public BigDecimal getContractRound() { + return contractRound; + } + + public void setContractRound(BigDecimal contractRound) { + this.contractRound = contractRound; + } + + public BigDecimal getHuazhiRound() { + return huazhiRound; + } + + public void setHuazhiRound(BigDecimal huazhiRound) { + this.huazhiRound = huazhiRound; + } + + public BigDecimal getZiguangRound() { + return ziguangRound; + } + + public void setZiguangRound(BigDecimal ziguangRound) { + this.ziguangRound = ziguangRound; + } } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index a89ed4b..9ff1d47 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -52,7 +52,7 @@ public class ProjectService { "CASE p.status WHEN 0 THEN '草稿' WHEN 1 THEN '项目创建' WHEN 5 THEN '概算完成' WHEN 10 THEN '预算完成' WHEN 15 THEN '结算中' WHEN 20 THEN '决算完成' ELSE '未知' AS statusDesc," + "CASE p.approve_status WHEN 0 THEN '待审核' WHEN 1 THEN '审核通过' WHEN 2 THEN '审核不通过' ELSE '未知' AS approveStatusDesc," + */ - QueryHelper queryHelper = new QueryHelper("SELECT p.*","project","p"); + QueryHelper queryHelper = new QueryHelper("SELECT p.*, Round(p.contract_amount,2) as contractRound, Round(p.huazhi_product_amount,2) as huazhiRound, Round(p.ziguang_other_amount,2) as ziguangRound","project","p"); if(StrUtil.isNotEmpty(searchInfo.get("status")) && !"-1".equals(searchInfo.get("status"))){ queryHelper.addCondition("p.status=?", Integer.parseInt(searchInfo.get("status"))); } From 6a061dfbf213a0d14ce14f2b08794b5d02903ca4 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Fri, 22 Jul 2022 17:45:19 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/palmte/work/model/Project.java | 18 +++++++++--------- .../cn/palmte/work/service/ProjectService.java | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index db8abf1..b954dcb 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -183,13 +183,13 @@ public class Project { private String planEndStr; @Transient - private BigDecimal contractRound; + private String contractRound; @Transient - private BigDecimal huazhiRound; + private String huazhiRound; @Transient - private BigDecimal ziguangRound; + private String ziguangRound; public int getId() { return id; @@ -511,27 +511,27 @@ public class Project { this.planEndStr = planEndStr; } - public BigDecimal getContractRound() { + public String getContractRound() { return contractRound; } - public void setContractRound(BigDecimal contractRound) { + public void setContractRound(String contractRound) { this.contractRound = contractRound; } - public BigDecimal getHuazhiRound() { + public String getHuazhiRound() { return huazhiRound; } - public void setHuazhiRound(BigDecimal huazhiRound) { + public void setHuazhiRound(String huazhiRound) { this.huazhiRound = huazhiRound; } - public BigDecimal getZiguangRound() { + public String getZiguangRound() { return ziguangRound; } - public void setZiguangRound(BigDecimal ziguangRound) { + public void setZiguangRound(String ziguangRound) { this.ziguangRound = ziguangRound; } } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index 9ff1d47..62382d9 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -52,7 +52,7 @@ public class ProjectService { "CASE p.status WHEN 0 THEN '草稿' WHEN 1 THEN '项目创建' WHEN 5 THEN '概算完成' WHEN 10 THEN '预算完成' WHEN 15 THEN '结算中' WHEN 20 THEN '决算完成' ELSE '未知' AS statusDesc," + "CASE p.approve_status WHEN 0 THEN '待审核' WHEN 1 THEN '审核通过' WHEN 2 THEN '审核不通过' ELSE '未知' AS approveStatusDesc," + */ - QueryHelper queryHelper = new QueryHelper("SELECT p.*, Round(p.contract_amount,2) as contractRound, Round(p.huazhi_product_amount,2) as huazhiRound, Round(p.ziguang_other_amount,2) as ziguangRound","project","p"); + QueryHelper queryHelper = new QueryHelper("SELECT p.*, FORMAT(p.contract_amount,2) as contractRound, FORMAT(p.huazhi_product_amount,2) as huazhiRound, FORMAT(p.ziguang_other_amount,2) as ziguangRound","project","p"); if(StrUtil.isNotEmpty(searchInfo.get("status")) && !"-1".equals(searchInfo.get("status"))){ queryHelper.addCondition("p.status=?", Integer.parseInt(searchInfo.get("status"))); } From 63c45a55b758086cc6f7c9b7a3462f267916bbe2 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Mon, 25 Jul 2022 14:31:23 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A6=82=E7=AE=97?= =?UTF-8?q?=E4=B8=BA=E7=AB=8B=E9=A1=B9(=E6=A6=82=E7=AE=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 +- src/main/resources/templates/admin/project_budget_edit.ftl | 2 +- src/main/resources/templates/admin/project_estimate_add.ftl | 2 +- src/main/resources/templates/admin/project_estimate_edit.ftl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index e5b4b57..e976405 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -116,7 +116,7 @@
  • class="am-active">项目基本信息
    • <#if project.status==1 || project.status==5 || project.status==10 || project.status==15> -
  • 项目概算信息
    • +
  • 项目立项(概算)信息
    • <#if project.status==5 || project.status==10 || project.status==15>
  • 项目预算信息
    • diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index e7176b9..b319292 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -44,7 +44,7 @@
    • 项目基本信息
      • -
    • 项目概算信息
      • +
    • 项目立项(概算)信息
    • 收入明细表
    • 采购成本明细表
    • 项目管理成本表
      • diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 9406e4c..ef0924e 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -4,7 +4,7 @@
      -
      项目概算表
      +
      项目立项(概算)表
      diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index 313f67d..7072a30 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -12,7 +12,7 @@
      -
      项目概算表 / ${project.name}
      +
      项目立项(概算)表 / ${project.name}
      From ac4fbb6e8cb4eb99f3309c4709497f314e439134 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Fri, 29 Jul 2022 14:24:35 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=BC=96=E8=BE=91=E9=A1=B9=E7=9B=AE=E7=BC=96?= =?UTF-8?q?=E5=8F=B7?= 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 e976405..cb87402 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -164,7 +164,7 @@
      <#----> - +