From 90ec91cc695e9f03642b56377058468bbb1e1c21 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 26 Sep 2018 20:19:10 +0800 Subject: [PATCH] =?UTF-8?q?demo=E8=A7=86=E5=9B=BE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0demo=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jeesite/modules/test/web/DemoController.java | 4 ++-- .../demo/{dataGridEditGrid.html => demoDataGridEditGrid.html} | 0 .../{dataGridGroupGrid.html => demoDataGridGroupGrid.html} | 0 .../modules/demo/{formEditForm.html => demoFormEditForm.html} | 0 .../demo/{formLayoutForm.html => demoFormLayoutForm.html} | 0 .../demo/{formTableForm.html => demoFormTableForm.html} | 0 6 files changed, 2 insertions(+), 2 deletions(-) rename web/src/main/resources/views/modules/demo/{dataGridEditGrid.html => demoDataGridEditGrid.html} (100%) rename web/src/main/resources/views/modules/demo/{dataGridGroupGrid.html => demoDataGridGroupGrid.html} (100%) rename web/src/main/resources/views/modules/demo/{formEditForm.html => demoFormEditForm.html} (100%) rename web/src/main/resources/views/modules/demo/{formLayoutForm.html => demoFormLayoutForm.html} (100%) rename web/src/main/resources/views/modules/demo/{formTableForm.html => demoFormTableForm.html} (100%) diff --git a/web/src/main/java/com/jeesite/modules/test/web/DemoController.java b/web/src/main/java/com/jeesite/modules/test/web/DemoController.java index 2abd2360..a08545d1 100644 --- a/web/src/main/java/com/jeesite/modules/test/web/DemoController.java +++ b/web/src/main/java/com/jeesite/modules/test/web/DemoController.java @@ -42,7 +42,7 @@ public class DemoController extends BaseController { @RequiresPermissions("test:testData:view") @RequestMapping(value = "dataGrid/{viewName}") public String dataGrid(@PathVariable String viewName, TestData testData, Model model) { - return "modules/demo/dataGrid" + StringUtils.cap(viewName); + return "modules/demo/demoDataGrid" + StringUtils.cap(viewName); } /** @@ -51,7 +51,7 @@ public class DemoController extends BaseController { @RequiresPermissions("test:testData:view") @RequestMapping(value = "form/{viewName}") public String form(@PathVariable String viewName, TestData testData, Model model) { - return "modules/demo/form" + StringUtils.cap(viewName); + return "modules/demo/demoForm" + StringUtils.cap(viewName); } } \ No newline at end of file diff --git a/web/src/main/resources/views/modules/demo/dataGridEditGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html similarity index 100% rename from web/src/main/resources/views/modules/demo/dataGridEditGrid.html rename to web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html diff --git a/web/src/main/resources/views/modules/demo/dataGridGroupGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html similarity index 100% rename from web/src/main/resources/views/modules/demo/dataGridGroupGrid.html rename to web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html diff --git a/web/src/main/resources/views/modules/demo/formEditForm.html b/web/src/main/resources/views/modules/demo/demoFormEditForm.html similarity index 100% rename from web/src/main/resources/views/modules/demo/formEditForm.html rename to web/src/main/resources/views/modules/demo/demoFormEditForm.html diff --git a/web/src/main/resources/views/modules/demo/formLayoutForm.html b/web/src/main/resources/views/modules/demo/demoFormLayoutForm.html similarity index 100% rename from web/src/main/resources/views/modules/demo/formLayoutForm.html rename to web/src/main/resources/views/modules/demo/demoFormLayoutForm.html diff --git a/web/src/main/resources/views/modules/demo/formTableForm.html b/web/src/main/resources/views/modules/demo/demoFormTableForm.html similarity index 100% rename from web/src/main/resources/views/modules/demo/formTableForm.html rename to web/src/main/resources/views/modules/demo/demoFormTableForm.html