From c1c4860df72a103994e751a202a00bb0f77af3ad Mon Sep 17 00:00:00 2001 From: wangbing Date: Thu, 30 Jan 2020 00:18:16 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: e330814b5d54c36b03f1be93849ad14d64ee6a55 --- .../resources/templates/screen/module/mgr.ftl | 7 +++++-- .../templates/screen/module/system/dept.ftl | 2 +- .../templates/screen/module/system/logErr.ftl | 20 +++---------------- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl index 9ee970b1..38e90ae6 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl @@ -123,8 +123,11 @@ width="140" - <#if item.fieldType.javaType() == 'Long'>width="140" +<#if item.fieldType.javaType() == 'Date'> + width="140" +<#elseif item.fieldType.javaType() == 'Long'> + width="140" + label="${item.fieldComment?default("")}"> diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl index 63a33489..d2cab2a1 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl @@ -411,6 +411,6 @@ mounted: function () { this.onFind(); this.onLoadTree(); - }, + } }) diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl index bc8e7925..bd737a68 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl @@ -75,50 +75,36 @@ 取 消 保存 - +