diff --git a/modules/pom.xml b/modules/pom.xml
index ab631f6a..edeaea43 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -13,9 +13,10 @@
 	<inceptionYear>2013-Now</inceptionYear>
 	
 	<modules>
-        <module>core</module>
-        <module>cms</module>
+		<module>core</module>
 		<module>app</module>
+        <module>cms</module>
+		<module>test</module>
     </modules>
 	
 	<developers>  
diff --git a/modules/test/bin/deploy.bat b/modules/test/bin/deploy.bat
new file mode 100644
index 00000000..f4258bf5
--- /dev/null
+++ b/modules/test/bin/deploy.bat
@@ -0,0 +1,22 @@
+@echo off
+rem /**
+rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+rem  * No deletion without permission, or be held responsible to law.
+rem  *
+rem  * Author: ThinkGem@163.com
+rem  */
+echo.
+echo [信息] 部署工程到Maven服务器。
+echo.
+
+%~d0
+cd %~dp0
+
+call mvn -v
+echo.
+
+cd ..
+call mvn clean deploy -Dmaven.test.skip=true -Pdeploy
+
+cd bin
+pause
\ No newline at end of file
diff --git a/modules/test/bin/deploy.sh b/modules/test/bin/deploy.sh
new file mode 100644
index 00000000..f8696c71
--- /dev/null
+++ b/modules/test/bin/deploy.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+# /**
+#  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+#  * No deletion without permission, or be held responsible to law.
+#  *
+#  * Author: ThinkGem@163.com
+#  */
+echo ""
+echo "[淇℃伅] 閮ㄧ讲宸ョ▼鍒癕aven鏈嶅姟鍣ㄣ��"
+echo ""
+
+mvn -v
+echo ""
+
+cd ..
+mvn clean deploy -Dmaven.test.skip=true -Pdeploy
+
+cd bin
\ No newline at end of file
diff --git a/modules/test/bin/package.bat b/modules/test/bin/package.bat
new file mode 100644
index 00000000..a6b29c2c
--- /dev/null
+++ b/modules/test/bin/package.bat
@@ -0,0 +1,22 @@
+@echo off
+rem /**
+rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+rem  * No deletion without permission, or be held responsible to law.
+rem  *
+rem  * Author: ThinkGem@163.com
+rem  */
+echo.
+echo [信息] 打包安装工程，生成jar包文件。
+echo.
+
+%~d0
+cd %~dp0
+
+call mvn -v
+echo.
+
+cd ..
+call mvn clean install -Dmaven.test.skip=true -Ppackage
+
+cd bin
+pause
\ No newline at end of file
diff --git a/modules/test/bin/package.sh b/modules/test/bin/package.sh
new file mode 100644
index 00000000..8deff508
--- /dev/null
+++ b/modules/test/bin/package.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+# /**
+#  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+#  * No deletion without permission, or be held responsible to law.
+#  *
+#  * Author: ThinkGem@163.com
+#  */
+echo ""
+echo "[淇℃伅] 鎵撳寘瀹夎宸ョ▼锛岀敓鎴恓ar鍖呮枃浠躲��"
+echo ""
+
+mvn -v
+echo ""
+
+cd ..
+mvn clean install -Dmaven.test.skip=true -Ppackage
+
+cd bin
\ No newline at end of file
diff --git a/web-api/db/h2/test.sql b/modules/test/db/h2/test.sql
similarity index 100%
rename from web-api/db/h2/test.sql
rename to modules/test/db/h2/test.sql
diff --git a/web-api/db/mssql/test.sql b/modules/test/db/mssql/test.sql
similarity index 100%
rename from web-api/db/mssql/test.sql
rename to modules/test/db/mssql/test.sql
diff --git a/web-api/db/mysql/create_user.sql b/modules/test/db/mysql/create_user.sql
similarity index 100%
rename from web-api/db/mysql/create_user.sql
rename to modules/test/db/mysql/create_user.sql
diff --git a/web-api/db/mysql/test.sql b/modules/test/db/mysql/test.sql
similarity index 100%
rename from web-api/db/mysql/test.sql
rename to modules/test/db/mysql/test.sql
diff --git a/web-api/db/oracle/create_user.sql b/modules/test/db/oracle/create_user.sql
similarity index 100%
rename from web-api/db/oracle/create_user.sql
rename to modules/test/db/oracle/create_user.sql
diff --git a/web-api/db/oracle/test.sql b/modules/test/db/oracle/test.sql
similarity index 100%
rename from web-api/db/oracle/test.sql
rename to modules/test/db/oracle/test.sql
diff --git a/web-api/db/postgresql/test.sql b/modules/test/db/postgresql/test.sql
similarity index 100%
rename from web-api/db/postgresql/test.sql
rename to modules/test/db/postgresql/test.sql
diff --git a/web-api/db/test.erm b/modules/test/db/test.erm
similarity index 100%
rename from web-api/db/test.erm
rename to modules/test/db/test.erm
diff --git a/web-api/db/test.png b/modules/test/db/test.png
similarity index 100%
rename from web-api/db/test.png
rename to modules/test/db/test.png
diff --git a/modules/test/pom.xml b/modules/test/pom.xml
new file mode 100644
index 00000000..cf492d4e
--- /dev/null
+++ b/modules/test/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>com.jeesite</groupId>
+		<artifactId>jeesite-parent</artifactId>
+		<version>5.8.0-SNAPSHOT</version>
+		<relativePath>../../parent/pom.xml</relativePath>
+	</parent>
+	
+	<artifactId>jeesite-module-test</artifactId>
+	<packaging>jar</packaging>
+	
+	<name>JeeSite Module Test</name>
+	<url>http://jeesite.com</url>
+	<inceptionYear>2013-Now</inceptionYear>
+	
+	<dependencies>
+			
+		<dependency>
+			<groupId>com.jeesite</groupId>
+			<artifactId>jeesite-module-core</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+		
+	</dependencies>
+	
+	<developers>  
+		<developer>
+			<id>thinkgem</id>
+			<name>WangZhen</name>
+			<email>thinkgem at 163.com</email>
+			<roles><role>Project lead</role></roles>
+			<timezone>+8</timezone>  
+		</developer>
+	</developers>
+	
+	<organization>
+		<name>JeeSite</name>
+		<url>http://jeesite.com</url>
+	</organization>
+	
+</project>
\ No newline at end of file
diff --git a/web-api/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java b/modules/test/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java
similarity index 100%
rename from web-api/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java
rename to modules/test/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java
diff --git a/web-api/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java b/modules/test/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java
similarity index 100%
rename from web-api/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java
rename to modules/test/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java
diff --git a/web-api/src/main/java/com/jeesite/modules/test/dao/TestTreeDao.java b/modules/test/src/main/java/com/jeesite/modules/test/dao/TestTreeDao.java
similarity index 100%
rename from web-api/src/main/java/com/jeesite/modules/test/dao/TestTreeDao.java
rename to modules/test/src/main/java/com/jeesite/modules/test/dao/TestTreeDao.java
diff --git a/web-api/src/main/java/com/jeesite/modules/test/db/InitTestData.java b/modules/test/src/main/java/com/jeesite/modules/test/db/InitTestData.java
similarity index 92%
rename from web-api/src/main/java/com/jeesite/modules/test/db/InitTestData.java
rename to modules/test/src/main/java/com/jeesite/modules/test/db/InitTestData.java
index 376844b7..ba6e408f 100644
--- a/web-api/src/main/java/com/jeesite/modules/test/db/InitTestData.java
+++ b/modules/test/src/main/java/com/jeesite/modules/test/db/InitTestData.java
@@ -4,6 +4,7 @@
  */
 package com.jeesite.modules.test.db;
 
+import com.jeesite.common.datasource.DataSourceHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
@@ -57,6 +58,7 @@ public class InitTestData extends BaseInitDataTests {
 		GenTable genTable = new GenTable();
 		genTable.setIsNewRecord(true);
 		genTable.setTableName("test_data");
+		genTable.setDataSourceName(dataSourceName);
 		genTable = genTableService.getFromDb(genTable);
 		genTable.setIsNewRecord(true);
 		genTable.setClassName("TestData");
@@ -72,11 +74,13 @@ public class InitTestData extends BaseInitDataTests {
 		genTable.getOptionMap().put("isFileUpload", Global.YES);
 		genTable.getOptionMap().put("isImageUpload", Global.YES);
 		initGenTableColumn(genTable);
+		DataSourceHolder.setDataSourceName(dataSourceName);
 		genTableService.save(genTable);
 		// 瀛愯〃
 		GenTable genTableChild = new GenTable();
 		genTableChild.setIsNewRecord(true);
 		genTableChild.setTableName("test_data_child");
+		genTableChild.setDataSourceName(dataSourceName);
 		genTableChild = genTableService.getFromDb(genTableChild);
 		genTableChild.setIsNewRecord(true);
 		genTableChild.setClassName("TestDataChild");
@@ -90,6 +94,7 @@ public class InitTestData extends BaseInitDataTests {
 		genTableChild.setParentTableName("test_data");
 		genTableChild.setParentTableFkName("test_data_id");
 		initGenTableColumn(genTableChild);
+		DataSourceHolder.setDataSourceName(dataSourceName);
 		genTableService.save(genTableChild);
 	}
 	
@@ -159,6 +164,7 @@ public class InitTestData extends BaseInitDataTests {
 		GenTable genTable = new GenTable();
 		genTable.setIsNewRecord(true);
 		genTable.setTableName("test_tree");
+		genTable.setDataSourceName(dataSourceName);
 		genTable = genTableService.getFromDb(genTable);
 		genTable.setIsNewRecord(true);
 		genTable.setClassName("TestTree");
@@ -176,6 +182,7 @@ public class InitTestData extends BaseInitDataTests {
 		genTable.getOptionMap().put("treeViewCode", "tree_code");
 		genTable.getOptionMap().put("treeViewName", "tree_name");
 		initGenTableColumn(genTable);
+		DataSourceHolder.setDataSourceName(dataSourceName);
 		genTableService.save(genTable);
 	}
 	
diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java b/modules/test/src/main/java/com/jeesite/modules/test/entity/TestData.java
similarity index 99%
rename from web/src/main/java/com/jeesite/modules/test/entity/TestData.java
rename to modules/test/src/main/java/com/jeesite/modules/test/entity/TestData.java
index dbd07330..1eeb13da 100644
--- a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java
+++ b/modules/test/src/main/java/com/jeesite/modules/test/entity/TestData.java
@@ -4,20 +4,21 @@
  */
 package com.jeesite.modules.test.entity;
 
-import javax.validation.constraints.Size;
 import java.util.Date;
-import com.jeesite.common.mybatis.annotation.JoinTable;
-import com.jeesite.common.mybatis.annotation.JoinTable.Type;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jeesite.modules.sys.entity.User;
-import com.jeesite.modules.sys.entity.Office;
 import java.util.List;
-import com.jeesite.common.collect.ListUtils;
 
+import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;
+import com.jeesite.common.mybatis.annotation.JoinTable;
+import com.jeesite.common.mybatis.annotation.JoinTable.Type;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
+import com.jeesite.modules.sys.entity.Office;
+import com.jeesite.modules.sys.entity.User;
 
 /**
  * 娴嬭瘯鏁版嵁Entity
diff --git a/web-fast/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java b/modules/test/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
similarity index 99%
rename from web-fast/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
rename to modules/test/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
index 4a83a789..8efbc9b6 100644
--- a/web-fast/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
+++ b/modules/test/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
@@ -4,18 +4,19 @@
  */
 package com.jeesite.modules.test.entity;
 
-import javax.validation.constraints.Size;
 import java.util.Date;
-import com.jeesite.common.mybatis.annotation.JoinTable;
-import com.jeesite.common.mybatis.annotation.JoinTable.Type;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jeesite.modules.sys.entity.User;
-import com.jeesite.modules.sys.entity.Office;
 
+import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;
+import com.jeesite.common.mybatis.annotation.JoinTable;
+import com.jeesite.common.mybatis.annotation.JoinTable.Type;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
+import com.jeesite.modules.sys.entity.Office;
+import com.jeesite.modules.sys.entity.User;
 
 /**
  * 娴嬭瘯鏁版嵁Entity
diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestTree.java b/modules/test/src/main/java/com/jeesite/modules/test/entity/TestTree.java
similarity index 100%
rename from web/src/main/java/com/jeesite/modules/test/entity/TestTree.java
rename to modules/test/src/main/java/com/jeesite/modules/test/entity/TestTree.java
index 4486ba5f..e368399f 100644
--- a/web/src/main/java/com/jeesite/modules/test/entity/TestTree.java
+++ b/modules/test/src/main/java/com/jeesite/modules/test/entity/TestTree.java
@@ -4,15 +4,15 @@
  */
 package com.jeesite.modules.test.entity;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
 import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.entity.TreeEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
 /**
  * 娴嬭瘯鏍戣〃Entity
  * @author ThinkGem
diff --git a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java b/modules/test/src/main/java/com/jeesite/modules/test/service/TestDataService.java
similarity index 100%
rename from web/src/main/java/com/jeesite/modules/test/service/TestDataService.java
rename to modules/test/src/main/java/com/jeesite/modules/test/service/TestDataService.java
diff --git a/web-api/src/main/java/com/jeesite/modules/test/service/TestTreeService.java b/modules/test/src/main/java/com/jeesite/modules/test/service/TestTreeService.java
similarity index 100%
rename from web-api/src/main/java/com/jeesite/modules/test/service/TestTreeService.java
rename to modules/test/src/main/java/com/jeesite/modules/test/service/TestTreeService.java
diff --git a/web-api/src/main/java/com/jeesite/modules/test/web/DemoController.java b/modules/test/src/main/java/com/jeesite/modules/test/web/DemoController.java
similarity index 100%
rename from web-api/src/main/java/com/jeesite/modules/test/web/DemoController.java
rename to modules/test/src/main/java/com/jeesite/modules/test/web/DemoController.java
diff --git a/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java b/modules/test/src/main/java/com/jeesite/modules/test/web/TestDataController.java
similarity index 100%
rename from web/src/main/java/com/jeesite/modules/test/web/TestDataController.java
rename to modules/test/src/main/java/com/jeesite/modules/test/web/TestDataController.java
diff --git a/web-api/src/main/java/com/jeesite/modules/test/web/TestTreeController.java b/modules/test/src/main/java/com/jeesite/modules/test/web/TestTreeController.java
similarity index 100%
rename from web-api/src/main/java/com/jeesite/modules/test/web/TestTreeController.java
rename to modules/test/src/main/java/com/jeesite/modules/test/web/TestTreeController.java
diff --git a/web-api/src/main/resources/db/create/h2/test.sql b/modules/test/src/main/resources/db/create/h2/test.sql
similarity index 100%
rename from web-api/src/main/resources/db/create/h2/test.sql
rename to modules/test/src/main/resources/db/create/h2/test.sql
diff --git a/web-api/src/main/resources/db/create/mssql/test.sql b/modules/test/src/main/resources/db/create/mssql/test.sql
similarity index 100%
rename from web-api/src/main/resources/db/create/mssql/test.sql
rename to modules/test/src/main/resources/db/create/mssql/test.sql
diff --git a/web-api/src/main/resources/db/create/mysql/test.sql b/modules/test/src/main/resources/db/create/mysql/test.sql
similarity index 100%
rename from web-api/src/main/resources/db/create/mysql/test.sql
rename to modules/test/src/main/resources/db/create/mysql/test.sql
diff --git a/web-api/src/main/resources/db/create/oracle/test.sql b/modules/test/src/main/resources/db/create/oracle/test.sql
similarity index 100%
rename from web-api/src/main/resources/db/create/oracle/test.sql
rename to modules/test/src/main/resources/db/create/oracle/test.sql
diff --git a/web-api/src/main/resources/db/create/postgresql/test.sql b/modules/test/src/main/resources/db/create/postgresql/test.sql
similarity index 100%
rename from web-api/src/main/resources/db/create/postgresql/test.sql
rename to modules/test/src/main/resources/db/create/postgresql/test.sql
diff --git a/web-api/src/main/resources/mappings/modules/test/TestDataChildDao.xml b/modules/test/src/main/resources/mappings/modules/test/TestDataChildDao.xml
similarity index 100%
rename from web-api/src/main/resources/mappings/modules/test/TestDataChildDao.xml
rename to modules/test/src/main/resources/mappings/modules/test/TestDataChildDao.xml
diff --git a/web-api/src/main/resources/mappings/modules/test/TestDataDao.xml b/modules/test/src/main/resources/mappings/modules/test/TestDataDao.xml
similarity index 100%
rename from web-api/src/main/resources/mappings/modules/test/TestDataDao.xml
rename to modules/test/src/main/resources/mappings/modules/test/TestDataDao.xml
diff --git a/web-api/src/main/resources/mappings/modules/test/TestTreeDao.xml b/modules/test/src/main/resources/mappings/modules/test/TestTreeDao.xml
similarity index 100%
rename from web-api/src/main/resources/mappings/modules/test/TestTreeDao.xml
rename to modules/test/src/main/resources/mappings/modules/test/TestTreeDao.xml
diff --git a/web-fast/src/main/resources/views/modules/demo/demoDataGridEditGrid.html b/modules/test/src/main/resources/views/modules/demo/demoDataGridEditGrid.html
similarity index 99%
rename from web-fast/src/main/resources/views/modules/demo/demoDataGridEditGrid.html
rename to modules/test/src/main/resources/views/modules/demo/demoDataGridEditGrid.html
index 360dabec..bfa2d1df 100644
--- a/web-fast/src/main/resources/views/modules/demo/demoDataGridEditGrid.html
+++ b/modules/test/src/main/resources/views/modules/demo/demoDataGridEditGrid.html
@@ -122,7 +122,7 @@
 <script>
 //# // 鍒濆鍖朌ataGrid瀵硅薄
 $('#dataGrid').dataGrid({
-	searchForm: $("#searchForm"),
+	searchForm: $('#searchForm'),
 	// 璁剧疆鏁版嵁琛ㄦ牸鍒�
 	columnModel: [
 		{header:'鐘舵��', name:'status', editable:true, hidden:true, unformat: function(val, obj, cell){return $('#'+obj.rowId+'_'+obj.colModel.name, cell).val();}},
diff --git a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html b/modules/test/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
similarity index 99%
rename from web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
rename to modules/test/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
index 81164591..d86391be 100644
--- a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
+++ b/modules/test/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
@@ -122,7 +122,7 @@
 <script>
 //# // 鍒濆鍖朌ataGrid瀵硅薄
 $('#dataGrid').dataGrid({
-	searchForm: $("#searchForm"),
+	searchForm: $('#searchForm'),
 	columnModel: [
 		{header:'鍗曡鏂囨湰', name:'testInput', index:'a.test_input', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){
 			if(obj.rowId == ''){ return '灏忚:'; }
diff --git a/web-fast/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html b/modules/test/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html
similarity index 97%
rename from web-fast/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html
rename to modules/test/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html
index 4659800f..e83156bf 100644
--- a/web-fast/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html
+++ b/modules/test/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html
@@ -59,14 +59,14 @@ $('body').layout({
 });
 //# // 鍒濆鍖朌ataGrid瀵硅薄
 $('#dataGrid').dataGrid({
-	searchForm: $("#searchForm"),
+	searchForm: $('#searchForm'),
 	dataGridPage: $('#dataGridPage'),
 	autoGridHeight: function(){
 		return $('#searchForm').parent().height() - $('#dataGridPage').height() - 58;
 	},
 	columnModel: [
 		{header:'${text("宀椾綅鍚嶇О")}', name:'postName', index:'a.post_name', width:200, align:"center"},
-		{header:'${text("宀椾綅浠ｇ爜")}', name:'postCode', index:'a.post_code', width:200, align:"center"},
+		{header:'${text("宀椾綅缂栫爜")}', name:'postCode', index:'a.post_code', width:200, align:"center"},
 		{header:'${text("鎺掑簭鍙�")}', name:'postSort', index:'a.post_sort', width:80, align:"center"},
 		{header:'${text("宀椾綅鍒嗙被")}', name:'postType', index:'a.post_type', width:100, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_post_type')}", val, '鏈煡', true);
@@ -88,7 +88,7 @@ $('#dataGrid').dataGrid({
 });
 //# // 鍒濆鍖朌ataGrid瀵硅薄
 $('#dataGrid2').dataGrid({
-	searchForm: $("#searchForm2"),
+	searchForm: $('#searchForm2'),
 	dataGridPage: $('#dataGrid2Page'),
 	autoGridHeight: function(){
 		return $('#searchForm2').parent().height() - $('#dataGrid2Page').height() - 58;
diff --git a/web/src/main/resources/views/modules/demo/demoDataGridStateGrid.html b/modules/test/src/main/resources/views/modules/demo/demoDataGridStateGrid.html
similarity index 98%
rename from web/src/main/resources/views/modules/demo/demoDataGridStateGrid.html
rename to modules/test/src/main/resources/views/modules/demo/demoDataGridStateGrid.html
index 6b4e6efb..d7ef5dfb 100644
--- a/web/src/main/resources/views/modules/demo/demoDataGridStateGrid.html
+++ b/modules/test/src/main/resources/views/modules/demo/demoDataGridStateGrid.html
@@ -84,9 +84,9 @@ function formatter(val, obj, row, act) {
 
 //# // 鍒濆鍖朌ataGrid瀵硅薄
 $('#dataGrid').dataGrid({
-    searchForm: $("#searchForm"),
+    searchForm: $('#searchForm'),
     data: dataGridData.data,
-    datatype: "local", // 璁剧疆鏈湴鏁版嵁
+    datatype: 'local', // 璁剧疆鏈湴鏁版嵁
     columnModel: [
         {
             header: '澶у尯', name: 'parentArea', align: 'center', width: 150, sortable: false, formatter: formatter,
diff --git a/web-fast/src/main/resources/views/modules/demo/demoFormEditForm.html b/modules/test/src/main/resources/views/modules/demo/demoFormEditForm.html
similarity index 100%
rename from web-fast/src/main/resources/views/modules/demo/demoFormEditForm.html
rename to modules/test/src/main/resources/views/modules/demo/demoFormEditForm.html
diff --git a/web-fast/src/main/resources/views/modules/demo/demoFormLaydate.html b/modules/test/src/main/resources/views/modules/demo/demoFormLaydate.html
similarity index 100%
rename from web-fast/src/main/resources/views/modules/demo/demoFormLaydate.html
rename to modules/test/src/main/resources/views/modules/demo/demoFormLaydate.html
diff --git a/web/src/main/resources/views/modules/demo/demoFormLayoutForm.html b/modules/test/src/main/resources/views/modules/demo/demoFormLayoutForm.html
similarity index 99%
rename from web/src/main/resources/views/modules/demo/demoFormLayoutForm.html
rename to modules/test/src/main/resources/views/modules/demo/demoFormLayoutForm.html
index 4c269a1f..83f2ee37 100644
--- a/web/src/main/resources/views/modules/demo/demoFormLayoutForm.html
+++ b/modules/test/src/main/resources/views/modules/demo/demoFormLayoutForm.html
@@ -263,7 +263,7 @@
 </div>
 <% } %>
 <script>
-$("#inputForm").validate({
+$('#inputForm').validate({
 	submitHandler: function(form){
 // 		js.ajaxSubmitForm($(form), function(data){
 //			js.showMessage(data.message);
diff --git a/web-fast/src/main/resources/views/modules/demo/demoFormTabPage.html b/modules/test/src/main/resources/views/modules/demo/demoFormTabPage.html
similarity index 100%
rename from web-fast/src/main/resources/views/modules/demo/demoFormTabPage.html
rename to modules/test/src/main/resources/views/modules/demo/demoFormTabPage.html
diff --git a/web-fast/src/main/resources/views/modules/demo/demoFormTableForm.html b/modules/test/src/main/resources/views/modules/demo/demoFormTableForm.html
similarity index 98%
rename from web-fast/src/main/resources/views/modules/demo/demoFormTableForm.html
rename to modules/test/src/main/resources/views/modules/demo/demoFormTableForm.html
index 87ac93c0..1bf6f5a3 100644
--- a/web-fast/src/main/resources/views/modules/demo/demoFormTableForm.html
+++ b/modules/test/src/main/resources/views/modules/demo/demoFormTableForm.html
@@ -147,10 +147,10 @@
 <% } %>
 <script>
 //鍒濆鍖栨祴璇曟暟鎹瓙琛―ataGrid瀵硅薄
-$("#testDataChildDataGrid").dataGrid({
+$('#testDataChildDataGrid').dataGrid({
 
 	data: "#{toJson(testData.testDataChildList)}",
-	datatype: "local", // 璁剧疆鏈湴鏁版嵁
+	datatype: 'local', // 璁剧疆鏈湴鏁版嵁
 	autoGridHeight: function(){return 'auto'}, // 璁剧疆鑷姩楂樺害
 	
 	// 璁剧疆鏁版嵁琛ㄦ牸鍒�
@@ -223,7 +223,7 @@ $("#testDataChildDataGrid").dataGrid({
 	class="{{d.cssClass}}" btnClass="btn-sm" allowClear="true"/>
 </div>//--></script>
 <script>
-$("#inputForm").validate({
+$('#inputForm').validate({
 	submitHandler: function(form){
 // 		js.ajaxSubmitForm($(form), function(data){
 // 			js.showMessage(data.message);
diff --git a/web-fast/src/main/resources/views/modules/test/testDataForm.html b/modules/test/src/main/resources/views/modules/test/testDataForm.html
similarity index 100%
rename from web-fast/src/main/resources/views/modules/test/testDataForm.html
rename to modules/test/src/main/resources/views/modules/test/testDataForm.html
diff --git a/web/src/main/resources/views/modules/test/testDataForm2.html b/modules/test/src/main/resources/views/modules/test/testDataForm2.html
similarity index 100%
rename from web/src/main/resources/views/modules/test/testDataForm2.html
rename to modules/test/src/main/resources/views/modules/test/testDataForm2.html
diff --git a/web/src/main/resources/views/modules/test/testDataList.html b/modules/test/src/main/resources/views/modules/test/testDataList.html
similarity index 99%
rename from web/src/main/resources/views/modules/test/testDataList.html
rename to modules/test/src/main/resources/views/modules/test/testDataList.html
index c69e0914..f6b2a1a8 100644
--- a/web/src/main/resources/views/modules/test/testDataList.html
+++ b/modules/test/src/main/resources/views/modules/test/testDataList.html
@@ -120,7 +120,7 @@
 <script>
 //# // 鍒濆鍖朌ataGrid瀵硅薄
 $('#dataGrid').dataGrid({
-	searchForm: $("#searchForm"),
+	searchForm: $('#searchForm'),
 	columnModel: [
 		{header:'${text("鍗曡鏂囨湰")}', name:'testInput', index:'a.test_input', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
 			return '<a href="${ctx}/test/testData/form?id='+row.id+'&flag=2" class="btnList" data-title="${text("缂栬緫鏁版嵁")}">'+(val||row.id)+'</a>';
@@ -216,7 +216,7 @@ $('#dataGrid').dataGrid({
 	ajaxSuccess: function(data){
 //		// 鏃犳暟鎹樉绀猴紝v4.1.7 涔嬪墠鐗堟湰
 // 		if (data.count == 0){
-//			$("#dataGrid").parent().append("<div class=\"ml10\">娌℃湁绗﹀悎鏁版嵁</div>");
+//			$('#dataGrid').parent().append("<div class=\"ml10\">娌℃湁绗﹀悎鏁版嵁</div>");
 //		}
 //		// 鍒嗛〉鎺т欢鍚庨潰杩藉姞闄勫姞淇℃伅瀹炰緥
 // 		$('#dataGridPage ul:last').after('<ul class="pagination"><li class="disabled controls">鍒嗛〉闄勫姞淇℃伅</li></ul>');
diff --git a/web-fast/src/main/resources/views/modules/test/testTreeForm.html b/modules/test/src/main/resources/views/modules/test/testTreeForm.html
similarity index 99%
rename from web-fast/src/main/resources/views/modules/test/testTreeForm.html
rename to modules/test/src/main/resources/views/modules/test/testTreeForm.html
index 730c6557..ddf283f4 100644
--- a/web-fast/src/main/resources/views/modules/test/testTreeForm.html
+++ b/modules/test/src/main/resources/views/modules/test/testTreeForm.html
@@ -104,7 +104,7 @@
 </div>
 <% } %>
 <script>
-$("#inputForm").validate({
+$('#inputForm').validate({
 	submitHandler: function(form){
 		js.ajaxSubmitForm($(form), function(data){
 			js.showMessage(data.message);
diff --git a/web-fast/src/main/resources/views/modules/test/testTreeList.html b/modules/test/src/main/resources/views/modules/test/testTreeList.html
similarity index 97%
rename from web-fast/src/main/resources/views/modules/test/testTreeList.html
rename to modules/test/src/main/resources/views/modules/test/testTreeList.html
index d53bce32..c70680d6 100644
--- a/web-fast/src/main/resources/views/modules/test/testTreeList.html
+++ b/modules/test/src/main/resources/views/modules/test/testTreeList.html
@@ -50,7 +50,7 @@
 <script>
 //# // 鍒濆鍖朌ataGrid瀵硅薄
 $('#dataGrid').dataGrid({
-	searchForm: $("#searchForm"),
+	searchForm: $('#searchForm'),
 	columnModel: [
 		{header:'${text("鑺傜偣鍚嶇О")}', name:'treeName', index:'a.tree_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
 			return '( '+row.treeCode+' ) '+'<a href="${ctx}/test/testTree/form?treeCode='+row.treeCode+'" class="btnList" data-title="${text("缂栬緫鏁版嵁")}">'+(val||row.id)+'</a>';
diff --git a/web-api/pom.xml b/web-api/pom.xml
index fb650d19..05bab1ec 100644
--- a/web-api/pom.xml
+++ b/web-api/pom.xml
@@ -23,7 +23,7 @@
 		
 		<finalName>web</finalName><!-- war or jar 鍖呯殑鍚嶇О -->
 		<start-class>com.jeesite.modules.ApiApplication</start-class>
-		
+
 		<!-- docker setting -->
         <docker.run.port>8980:8980</docker.run.port>
 		
@@ -38,6 +38,13 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 
+		<!-- 娴嬭瘯妯″潡 -->
+		<dependency>
+			<groupId>com.jeesite</groupId>
+			<artifactId>jeesite-module-test</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+
 		<!-- 鍦ㄧ嚎鏂囨。鎺ュ彛 -->
 		<dependency>
 			<groupId>com.jeesite</groupId>
diff --git a/web-api/src/main/java/com/jeesite/modules/test/entity/TestData.java b/web-api/src/main/java/com/jeesite/modules/test/entity/TestData.java
deleted file mode 100644
index dbd07330..00000000
--- a/web-api/src/main/java/com/jeesite/modules/test/entity/TestData.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.entity;
-
-import javax.validation.constraints.Size;
-import java.util.Date;
-import com.jeesite.common.mybatis.annotation.JoinTable;
-import com.jeesite.common.mybatis.annotation.JoinTable.Type;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jeesite.modules.sys.entity.User;
-import com.jeesite.modules.sys.entity.Office;
-import java.util.List;
-import com.jeesite.common.collect.ListUtils;
-
-import com.jeesite.common.entity.DataEntity;
-import com.jeesite.common.mybatis.annotation.Column;
-import com.jeesite.common.mybatis.annotation.Table;
-import com.jeesite.common.mybatis.mapper.query.QueryType;
-
-/**
- * 娴嬭瘯鏁版嵁Entity
- * @author ThinkGem
- * @version 2018-04-22
- */
-@Table(name="test_data", alias="a", columns={
-		@Column(name="id", attrName="id", label="缂栧彿", isPK=true),
-		@Column(name="test_input", attrName="testInput", label="鍗曡鏂囨湰", queryType=QueryType.LIKE),
-		@Column(name="test_textarea", attrName="testTextarea", label="澶氳鏂囨湰", queryType=QueryType.LIKE),
-		@Column(name="test_select", attrName="testSelect", label="涓嬫媺妗�"),
-		@Column(name="test_select_multiple", attrName="testSelectMultiple", label="涓嬫媺澶氶��"),
-		@Column(name="test_radio", attrName="testRadio", label="鍗曢�夋"),
-		@Column(name="test_checkbox", attrName="testCheckbox", label="澶嶉�夋"),
-		@Column(name="test_date", attrName="testDate", label="鏃ユ湡閫夋嫨", isUpdateForce=true/*鏄惁寮哄埗鏇存柊锛堝綋璋冪敤update骞朵笖璇ュ睘鎬т负绌虹殑鏃跺�欙紝鍏佽鏇存柊涓虹┖锛�*/),
-		@Column(name="test_datetime", attrName="testDatetime", label="鏃ユ湡鏃堕棿", isUpdateForce=true),
-		@Column(name="test_user_code", attrName="testUser.userCode", label="鐢ㄦ埛閫夋嫨"),
-		@Column(name="test_office_code", attrName="testOffice.officeCode", label="鏈烘瀯閫夋嫨"),
-		@Column(name="test_area_code", attrName="testAreaCode", label="鍖哄煙閫夋嫨"),
-		@Column(name="test_area_name", attrName="testAreaName", label="鍖哄煙鍚嶇О"),
-		@Column(includeEntity=DataEntity.class),
-	}, joinTable={
-		@JoinTable(type=Type.LEFT_JOIN, entity=User.class, attrName="testUser", alias="u10",
-			on="u10.user_code = a.test_user_code", columns={
-				@Column(name="user_code", label="鐢ㄦ埛缂栫爜", isPK=true),
-				@Column(name="user_name", label="鐢ㄦ埛鍚嶇О", isQuery=false),
-		}),
-		@JoinTable(type=Type.LEFT_JOIN, entity=Office.class, attrName="testOffice", alias="u11",
-			on="u11.office_code = a.test_office_code", columns={
-				@Column(name="office_code", label="鏈烘瀯缂栫爜", isPK=true),
-				@Column(name="office_name", label="鏈烘瀯鍚嶇О", isQuery=false),
-		}),
-	}, orderBy="a.update_date DESC"
-)
-public class TestData extends DataEntity<TestData> {
-	
-	private static final long serialVersionUID = 1L;
-	private String testInput;		// 鍗曡鏂囨湰
-	private String testTextarea;		// 澶氳鏂囨湰
-	private String testSelect;		// 涓嬫媺妗�
-	private String testSelectMultiple;		// 涓嬫媺澶氶��
-	private String testRadio;		// 鍗曢�夋
-	private String testCheckbox;		// 澶嶉�夋
-	private Date testDate;		// 鏃ユ湡閫夋嫨
-	private Date testDatetime;		// 鏃ユ湡鏃堕棿
-	private User testUser;		// 鐢ㄦ埛閫夋嫨
-	private Office testOffice;		// 鏈烘瀯閫夋嫨
-	private String testAreaCode;		// 鍖哄煙閫夋嫨
-	private String testAreaName;		// 鍖哄煙鍚嶇О
-	private List<TestDataChild> testDataChildList = ListUtils.newArrayList();		// 瀛愯〃鍒楄〃
-	
-	public TestData() {
-		this(null);
-	}
-
-	public TestData(String id){
-		super(id);
-	}
-	
-	@Size(min=0, max=200, message="鍗曡鏂囨湰闀垮害涓嶈兘瓒呰繃 200 涓瓧绗�")
-	public String getTestInput() {
-		return testInput;
-	}
-
-	public void setTestInput(String testInput) {
-		this.testInput = testInput;
-	}
-	
-	@Size(min=0, max=200, message="澶氳鏂囨湰闀垮害涓嶈兘瓒呰繃 200 涓瓧绗�")
-	public String getTestTextarea() {
-		return testTextarea;
-	}
-
-	public void setTestTextarea(String testTextarea) {
-		this.testTextarea = testTextarea;
-	}
-	
-	@Size(min=0, max=10, message="涓嬫媺妗嗛暱搴︿笉鑳借秴杩� 10 涓瓧绗�")
-	public String getTestSelect() {
-		return testSelect;
-	}
-
-	public void setTestSelect(String testSelect) {
-		this.testSelect = testSelect;
-	}
-	
-	@Size(min=0, max=200, message="涓嬫媺澶氶�夐暱搴︿笉鑳借秴杩� 200 涓瓧绗�")
-	public String getTestSelectMultiple() {
-		return testSelectMultiple;
-	}
-
-	public void setTestSelectMultiple(String testSelectMultiple) {
-		this.testSelectMultiple = testSelectMultiple;
-	}
-	
-	@Size(min=0, max=10, message="鍗曢�夋闀垮害涓嶈兘瓒呰繃 10 涓瓧绗�")
-	public String getTestRadio() {
-		return testRadio;
-	}
-
-	public void setTestRadio(String testRadio) {
-		this.testRadio = testRadio;
-	}
-	
-	@Size(min=0, max=200, message="澶嶉�夋闀垮害涓嶈兘瓒呰繃 200 涓瓧绗�")
-	public String getTestCheckbox() {
-		return testCheckbox;
-	}
-
-	public void setTestCheckbox(String testCheckbox) {
-		this.testCheckbox = testCheckbox;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	public Date getTestDate() {
-		return testDate;
-	}
-
-	public void setTestDate(Date testDate) {
-		this.testDate = testDate;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-	public Date getTestDatetime() {
-		return testDatetime;
-	}
-
-	public void setTestDatetime(Date testDatetime) {
-		this.testDatetime = testDatetime;
-	}
-	
-	public User getTestUser() {
-		return testUser;
-	}
-
-	public void setTestUser(User testUser) {
-		this.testUser = testUser;
-	}
-	
-	public Office getTestOffice() {
-		return testOffice;
-	}
-
-	public void setTestOffice(Office testOffice) {
-		this.testOffice = testOffice;
-	}
-	
-	@Size(min=0, max=64, message="鍖哄煙閫夋嫨闀垮害涓嶈兘瓒呰繃 64 涓瓧绗�")
-	public String getTestAreaCode() {
-		return testAreaCode;
-	}
-
-	public void setTestAreaCode(String testAreaCode) {
-		this.testAreaCode = testAreaCode;
-	}
-	
-	@Size(min=0, max=100, message="鍖哄煙鍚嶇О闀垮害涓嶈兘瓒呰繃 100 涓瓧绗�")
-	public String getTestAreaName() {
-		return testAreaName;
-	}
-
-	public void setTestAreaName(String testAreaName) {
-		this.testAreaName = testAreaName;
-	}
-	
-	public Date getTestDate_gte() {
-		return sqlMap.getWhere().getValue("test_date", QueryType.GTE);
-	}
-
-	public void setTestDate_gte(Date testDate) {
-		sqlMap.getWhere().and("test_date", QueryType.GTE, testDate);
-	}
-	
-	public Date getTestDate_lte() {
-		return sqlMap.getWhere().getValue("test_date", QueryType.LTE);
-	}
-
-	public void setTestDate_lte(Date testDate) {
-		sqlMap.getWhere().and("test_date", QueryType.LTE, testDate);
-	}
-	
-	public Date getTestDatetime_gte() {
-		return sqlMap.getWhere().getValue("test_datetime", QueryType.GTE);
-	}
-
-	public void setTestDatetime_gte(Date testDatetime) {
-		sqlMap.getWhere().and("test_datetime", QueryType.GTE, testDatetime);
-	}
-	
-	public Date getTestDatetime_lte() {
-		return sqlMap.getWhere().getValue("test_datetime", QueryType.LTE);
-	}
-
-	public void setTestDatetime_lte(Date testDatetime) {
-		sqlMap.getWhere().and("test_datetime", QueryType.LTE, testDatetime);
-	}
-	
-	public List<TestDataChild> getTestDataChildList() {
-		return testDataChildList;
-	}
-
-	public void setTestDataChildList(List<TestDataChild> testDataChildList) {
-		this.testDataChildList = testDataChildList;
-	}
-	
-}
\ No newline at end of file
diff --git a/web-api/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java b/web-api/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
deleted file mode 100644
index 4a83a789..00000000
--- a/web-api/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.entity;
-
-import javax.validation.constraints.Size;
-import java.util.Date;
-import com.jeesite.common.mybatis.annotation.JoinTable;
-import com.jeesite.common.mybatis.annotation.JoinTable.Type;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jeesite.modules.sys.entity.User;
-import com.jeesite.modules.sys.entity.Office;
-
-import com.jeesite.common.entity.DataEntity;
-import com.jeesite.common.mybatis.annotation.Column;
-import com.jeesite.common.mybatis.annotation.Table;
-import com.jeesite.common.mybatis.mapper.query.QueryType;
-
-/**
- * 娴嬭瘯鏁版嵁Entity
- * @author ThinkGem
- * @version 2018-04-22
- */
-@Table(name="test_data_child", alias="a", columns={
-		@Column(name="id", attrName="id", label="缂栧彿", isPK=true),
-		@Column(name="test_sort", attrName="testSort", label="鎺掑簭鍙�"),
-		@Column(name="test_data_id", attrName="testData.id", label="鐖惰〃涓婚敭"),
-		@Column(name="test_input", attrName="testInput", label="鍗曡鏂囨湰", queryType=QueryType.LIKE),
-		@Column(name="test_textarea", attrName="testTextarea", label="澶氳鏂囨湰", queryType=QueryType.LIKE),
-		@Column(name="test_select", attrName="testSelect", label="涓嬫媺妗�"),
-		@Column(name="test_select_multiple", attrName="testSelectMultiple", label="涓嬫媺澶氶��"),
-		@Column(name="test_radio", attrName="testRadio", label="鍗曢�夋"),
-		@Column(name="test_checkbox", attrName="testCheckbox", label="澶嶉�夋"),
-		@Column(name="test_date", attrName="testDate", label="鏃ユ湡閫夋嫨", isUpdateForce=true),
-		@Column(name="test_datetime", attrName="testDatetime", label="鏃ユ湡鏃堕棿", isUpdateForce=true),
-		@Column(name="test_user_code", attrName="testUser.userCode", label="鐢ㄦ埛閫夋嫨"),
-		@Column(name="test_office_code", attrName="testOffice.officeCode", label="鏈烘瀯閫夋嫨"),
-		@Column(name="test_area_code", attrName="testAreaCode", label="鍖哄煙閫夋嫨"),
-		@Column(name="test_area_name", attrName="testAreaName", label="鍖哄煙鍚嶇О", isQuery=false),
-	}, joinTable={
-		@JoinTable(type=Type.LEFT_JOIN, entity=User.class, attrName="testUser", alias="u12",
-			on="u12.user_code = a.test_user_code", columns={
-				@Column(name="user_code", label="鐢ㄦ埛缂栫爜", isPK=true),
-				@Column(name="user_name", label="鐢ㄦ埛鍚嶇О", isQuery=false),
-		}),
-		@JoinTable(type=Type.LEFT_JOIN, entity=Office.class, attrName="testOffice", alias="u13",
-			on="u13.office_code = a.test_office_code", columns={
-				@Column(name="office_code", label="鏈烘瀯缂栫爜", isPK=true),
-				@Column(name="office_name", label="鏈烘瀯鍚嶇О", isQuery=false),
-		}),
-	}, orderBy="a.id ASC"
-)
-public class TestDataChild extends DataEntity<TestDataChild> {
-	
-	private static final long serialVersionUID = 1L;
-	private Long testSort;		// 鎺掑簭鍙�
-	private TestData testData;		// 鐖惰〃涓婚敭 鐖剁被
-	private String testInput;		// 鍗曡鏂囨湰
-	private String testTextarea;		// 澶氳鏂囨湰
-	private String testSelect;		// 涓嬫媺妗�
-	private String testSelectMultiple;		// 涓嬫媺澶氶��
-	private String testRadio;		// 鍗曢�夋
-	private String testCheckbox;		// 澶嶉�夋
-	private Date testDate;		// 鏃ユ湡閫夋嫨
-	private Date testDatetime;		// 鏃ユ湡鏃堕棿
-	private User testUser;		// 鐢ㄦ埛閫夋嫨
-	private Office testOffice;		// 鏈烘瀯閫夋嫨
-	private String testAreaCode;		// 鍖哄煙閫夋嫨
-	private String testAreaName;		// 鍖哄煙鍚嶇О
-	
-	public TestDataChild() {
-		this(null);
-	}
-
-
-	public TestDataChild(TestData testData){
-		this.testData = testData;
-	}
-	
-	public Long getTestSort() {
-		return testSort;
-	}
-
-	public void setTestSort(Long testSort) {
-		this.testSort = testSort;
-	}
-	
-	@Size(min=0, max=64, message="鐖惰〃涓婚敭闀垮害涓嶈兘瓒呰繃 64 涓瓧绗�")
-	public TestData getTestData() {
-		return testData;
-	}
-
-	public void setTestData(TestData testData) {
-		this.testData = testData;
-	}
-	
-	@Size(min=0, max=200, message="鍗曡鏂囨湰闀垮害涓嶈兘瓒呰繃 200 涓瓧绗�")
-	public String getTestInput() {
-		return testInput;
-	}
-
-	public void setTestInput(String testInput) {
-		this.testInput = testInput;
-	}
-	
-	@Size(min=0, max=200, message="澶氳鏂囨湰闀垮害涓嶈兘瓒呰繃 200 涓瓧绗�")
-	public String getTestTextarea() {
-		return testTextarea;
-	}
-
-	public void setTestTextarea(String testTextarea) {
-		this.testTextarea = testTextarea;
-	}
-	
-	@Size(min=0, max=10, message="涓嬫媺妗嗛暱搴︿笉鑳借秴杩� 10 涓瓧绗�")
-	public String getTestSelect() {
-		return testSelect;
-	}
-
-	public void setTestSelect(String testSelect) {
-		this.testSelect = testSelect;
-	}
-	
-	@Size(min=0, max=200, message="涓嬫媺澶氶�夐暱搴︿笉鑳借秴杩� 200 涓瓧绗�")
-	public String getTestSelectMultiple() {
-		return testSelectMultiple;
-	}
-
-	public void setTestSelectMultiple(String testSelectMultiple) {
-		this.testSelectMultiple = testSelectMultiple;
-	}
-	
-	@Size(min=0, max=10, message="鍗曢�夋闀垮害涓嶈兘瓒呰繃 10 涓瓧绗�")
-	public String getTestRadio() {
-		return testRadio;
-	}
-
-	public void setTestRadio(String testRadio) {
-		this.testRadio = testRadio;
-	}
-	
-	@Size(min=0, max=200, message="澶嶉�夋闀垮害涓嶈兘瓒呰繃 200 涓瓧绗�")
-	public String getTestCheckbox() {
-		return testCheckbox;
-	}
-
-	public void setTestCheckbox(String testCheckbox) {
-		this.testCheckbox = testCheckbox;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	public Date getTestDate() {
-		return testDate;
-	}
-
-	public void setTestDate(Date testDate) {
-		this.testDate = testDate;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-	public Date getTestDatetime() {
-		return testDatetime;
-	}
-
-	public void setTestDatetime(Date testDatetime) {
-		this.testDatetime = testDatetime;
-	}
-	
-	public User getTestUser() {
-		return testUser;
-	}
-
-	public void setTestUser(User testUser) {
-		this.testUser = testUser;
-	}
-	
-	public Office getTestOffice() {
-		return testOffice;
-	}
-
-	public void setTestOffice(Office testOffice) {
-		this.testOffice = testOffice;
-	}
-	
-	@Size(min=0, max=64, message="鍖哄煙閫夋嫨闀垮害涓嶈兘瓒呰繃 64 涓瓧绗�")
-	public String getTestAreaCode() {
-		return testAreaCode;
-	}
-
-	public void setTestAreaCode(String testAreaCode) {
-		this.testAreaCode = testAreaCode;
-	}
-	
-	@Size(min=0, max=100, message="鍖哄煙鍚嶇О闀垮害涓嶈兘瓒呰繃 100 涓瓧绗�")
-	public String getTestAreaName() {
-		return testAreaName;
-	}
-
-	public void setTestAreaName(String testAreaName) {
-		this.testAreaName = testAreaName;
-	}
-	
-	public Date getTestDate_gte() {
-		return sqlMap.getWhere().getValue("test_date", QueryType.GTE);
-	}
-
-	public void setTestDate_gte(Date testDate) {
-		sqlMap.getWhere().and("test_date", QueryType.GTE, testDate);
-	}
-	
-	public Date getTestDate_lte() {
-		return sqlMap.getWhere().getValue("test_date", QueryType.LTE);
-	}
-
-	public void setTestDate_lte(Date testDate) {
-		sqlMap.getWhere().and("test_date", QueryType.LTE, testDate);
-	}
-	
-	public Date getTestDatetime_gte() {
-		return sqlMap.getWhere().getValue("test_datetime", QueryType.GTE);
-	}
-
-	public void setTestDatetime_gte(Date testDatetime) {
-		sqlMap.getWhere().and("test_datetime", QueryType.GTE, testDatetime);
-	}
-	
-	public Date getTestDatetime_lte() {
-		return sqlMap.getWhere().getValue("test_datetime", QueryType.LTE);
-	}
-
-	public void setTestDatetime_lte(Date testDatetime) {
-		sqlMap.getWhere().and("test_datetime", QueryType.LTE, testDatetime);
-	}
-	
-}
\ No newline at end of file
diff --git a/web-api/src/main/java/com/jeesite/modules/test/entity/TestTree.java b/web-api/src/main/java/com/jeesite/modules/test/entity/TestTree.java
deleted file mode 100644
index 4486ba5f..00000000
--- a/web-api/src/main/java/com/jeesite/modules/test/entity/TestTree.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.entity;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-import com.jeesite.common.entity.DataEntity;
-import com.jeesite.common.entity.TreeEntity;
-import com.jeesite.common.mybatis.annotation.Column;
-import com.jeesite.common.mybatis.annotation.Table;
-import com.jeesite.common.mybatis.mapper.query.QueryType;
-
-/**
- * 娴嬭瘯鏍戣〃Entity
- * @author ThinkGem
- * @version 2018-04-22
- */
-@Table(name="test_tree", alias="a", columns={
-		@Column(name="tree_code", attrName="treeCode", label="鑺傜偣缂栫爜", isPK=true),
-		@Column(includeEntity=TreeEntity.class),
-		@Column(name="tree_name", attrName="treeName", label="鑺傜偣鍚嶇О", queryType=QueryType.LIKE, isTreeName=true),
-		@Column(includeEntity=DataEntity.class),
-	}, orderBy="a.tree_sorts, a.tree_code"
-)
-public class TestTree extends TreeEntity<TestTree> {
-	
-	private static final long serialVersionUID = 1L;
-	private String treeCode;		// 鑺傜偣缂栫爜
-	private String treeName;		// 鑺傜偣鍚嶇О
-	
-	public TestTree() {
-		this(null);
-	}
-
-	public TestTree(String id){
-		super(id);
-	}
-	
-	@Override
-	public TestTree getParent() {
-		return parent;
-	}
-
-	@Override
-	public void setParent(TestTree parent) {
-		this.parent = parent;
-	}
-	
-	public String getTreeCode() {
-		return treeCode;
-	}
-
-	public void setTreeCode(String treeCode) {
-		this.treeCode = treeCode;
-	}
-	
-	@NotBlank(message="鑺傜偣鍚嶇О涓嶈兘涓虹┖")
-	@Size(min=0, max=200, message="鑺傜偣鍚嶇О闀垮害涓嶈兘瓒呰繃 200 涓瓧绗�")
-	public String getTreeName() {
-		return treeName;
-	}
-
-	public void setTreeName(String treeName) {
-		this.treeName = treeName;
-	}
-	
-}
\ No newline at end of file
diff --git a/web-api/src/main/java/com/jeesite/modules/test/service/TestDataService.java b/web-api/src/main/java/com/jeesite/modules/test/service/TestDataService.java
deleted file mode 100644
index 8a71e462..00000000
--- a/web-api/src/main/java/com/jeesite/modules/test/service/TestDataService.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.service;
-
-import com.jeesite.common.entity.Page;
-import com.jeesite.common.idgen.IdGen;
-import com.jeesite.common.lang.DateUtils;
-import com.jeesite.common.service.CrudService;
-import com.jeesite.modules.file.utils.FileUploadUtils;
-import com.jeesite.modules.sys.service.UserService;
-import com.jeesite.modules.test.dao.TestDataChildDao;
-import com.jeesite.modules.test.dao.TestDataDao;
-import com.jeesite.modules.test.entity.TestData;
-import com.jeesite.modules.test.entity.TestDataChild;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 娴嬭瘯鏁版嵁Service
- * @author ThinkGem
- * @version 2018-04-22
- */
-@Service
-public class TestDataService extends CrudService<TestDataDao, TestData> {
-	
-	@Autowired
-	private TestDataChildDao testDataChildDao;
-	
-	/**
-	 * 鑾峰彇鍗曟潯鏁版嵁
-	 * @param testData
-	 * @return
-	 */
-	@Override
-	public TestData get(TestData testData) {
-		TestData entity = super.get(testData);
-		if (entity != null){
-			TestDataChild testDataChild = new TestDataChild(entity);
-			testDataChild.setStatus(TestDataChild.STATUS_NORMAL);
-			entity.setTestDataChildList(testDataChildDao.findList(testDataChild));
-		}
-		return entity;
-	}
-	
-	/**
-	 * 鏌ヨ鍒嗛〉鏁版嵁
-	 * @param testData page 鍒嗛〉瀵硅薄
-	 * @param testData 鏌ヨ鏉′欢
-	 * @return
-	 */
-	@Override
-	public Page<TestData> findPage(TestData testData) {
-		
-//		// 婕旂ずMap鍙傛暟鍜岃繑鍥炲�硷紝鏀寔鍒嗛〉
-//		Page<Map<String, Object>> pageMap = new Page<>();
-//		Map<String, Object> params = MapUtils.newHashMap();
-//		params.put("testInput", "123");
-//		params.put("page", pageMap);
-//		pageMap.setList(dao.findListForMap(params));
-//		System.out.println(pageMap.getList());
-//		System.out.println(pageMap.getCount());
-		
-		return super.findPage(testData);
-	}
-	
-	/**
-	 * 鏌ヨ瀛愯〃鍒嗛〉鏁版嵁
-	 * @param testData 鏌ヨ鏉′欢
-	 * @param testData page 鍒嗛〉瀵硅薄
-	 * @return
-	 */
-	public List<TestDataChild> findSubList(TestDataChild testData) {
-		return testDataChildDao.findList(testData);
-	}
-	
-	/**
-	 * 淇濆瓨鏁版嵁锛堟彃鍏ユ垨鏇存柊锛�
-	 * @param testData
-	 */
-	@Override
-	@Transactional
-	public void save(TestData testData) {
-		super.save(testData);
-		// 淇濆瓨涓婁紶鍥剧墖
-		FileUploadUtils.saveFileUpload(testData, testData.getId(), "testData_image");
-		// 淇濆瓨涓婁紶闄勪欢
-		FileUploadUtils.saveFileUpload(testData, testData.getId(), "testData_file");
-		// 淇濆瓨 TestData瀛愯〃
-		int index = 0;
-		for (TestDataChild testDataChild : testData.getTestDataChildList()){
-			if (!TestDataChild.STATUS_DELETE.equals(testDataChild.getStatus())){
-				testDataChild.setTestData(testData);
-				if (testDataChild.getIsNewRecord()){
-					testDataChild.preInsert();
-					testDataChildDao.insert(testDataChild);
-				}else{
-					testDataChild.preUpdate();
-					testDataChildDao.update(testDataChild);
-				}
-			}else{
-				testDataChildDao.delete(testDataChild);
-			}
-			// 淇濆瓨涓婁紶闄勪欢
-			FileUploadUtils.saveFileUpload(testDataChild, testDataChild.getId(),
-					"testDataChildList["+index+"].testDataChild_file");
-			index++;
-		}
-	}
-	
-	/**
-	 * 鏇存柊鐘舵��
-	 * @param testData
-	 */
-	@Override
-	@Transactional
-	public void updateStatus(TestData testData) {
-		super.updateStatus(testData);
-	}
-	
-	/**
-	 * 鍒犻櫎鏁版嵁
-	 * @param testData
-	 */
-	@Override
-	@Transactional
-	public void delete(TestData testData) {
-		super.delete(testData);
-		TestDataChild testDataChild = new TestDataChild();
-		testDataChild.setTestData(testData);
-		testDataChildDao.deleteByEntity(testDataChild);
-	}
-	
-	/**
-	 * 浠诲姟璋冨害娴嬭瘯锛歵estDataService.executeTestTask(userService, 1, 2L, 3F, 4D, 'abc')
-	 */
-	public void executeTestTask(UserService userService, Integer i, Long l, Float f, Double d, String s){
-		System.out.println(DateUtils.getTime() + " 浠诲姟鎵ц浜唦~~  bean: " + userService + ", i: " + i
-				+ ", l: " + l + ", f: " + f + ", d: " + d + ", s: " + s);
-	}
-	
-	/**
-	 * 浜嬪姟娴嬭瘯锛岃嫢 Child 鎶ラ敊锛屽垯鍥炴粴
-	 */
-	@Transactional//(propagation = Propagation.NOT_SUPPORTED)
-	public void transTest(TestData testData) {
-		testData.setTestInput("transTest");
-		testData.setTestTextarea(IdGen.randomBase62(5));
-		dao.insert(testData);
-		TestDataChild testDataChild = new TestDataChild();
-		testDataChild.setTestData(testData);
-		// 璁剧疆涓�涓秴鍑烘暟鎹簱鑼冨洿鐨勫�硷紝鎶涘嚭鏁版嵁搴撳紓甯�
-		StringBuilder sb = new StringBuilder();
-		for (int i=0; i<500; i++){
-			sb.append("transTest" + i);
-		}
-		testDataChild.setTestInput(sb.toString());
-		testDataChildDao.insert(testDataChild);
-	}
-	
-	/**
-	 * 浜嬪姟楠岃瘉锛岃繑鍥炵┖锛屽垯浜嬪姟鍥炴粴鎴愬姛
-	 */
-	public boolean transValid(TestData testData) {
-		return dao.get(testData) == null;
-	}
-	
-}
\ No newline at end of file
diff --git a/web-api/src/main/java/com/jeesite/modules/test/web/TestDataController.java b/web-api/src/main/java/com/jeesite/modules/test/web/TestDataController.java
deleted file mode 100644
index 3eb3fb8d..00000000
--- a/web-api/src/main/java/com/jeesite/modules/test/web/TestDataController.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.web;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.jeesite.common.config.Global;
-import com.jeesite.common.entity.Page;
-import com.jeesite.common.web.BaseController;
-import com.jeesite.modules.test.entity.TestData;
-import com.jeesite.modules.test.entity.TestDataChild;
-import com.jeesite.modules.test.service.TestDataService;
-
-/**
- * 娴嬭瘯鏁版嵁Controller
- * @author ThinkGem
- * @version 2018-04-22
- */
-@Controller
-@RequestMapping(value = "${adminPath}/test/testData")
-public class TestDataController extends BaseController {
-
-	@Autowired
-	private TestDataService testDataService;
-	
-	/**
-	 * 鑾峰彇鏁版嵁
-	 */
-	@ModelAttribute
-	public TestData get(String id, boolean isNewRecord) {
-		return testDataService.get(id, isNewRecord);
-	}
-	
-	/**
-	 * 鏌ヨ鍒楄〃
-	 */
-	@RequiresPermissions("test:testData:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(TestData testData, Model model) {
-		model.addAttribute("testData", testData);
-		return "modules/test/testDataList";
-	}
-	
-	/**
-	 * 鏌ヨ鍒楄〃鏁版嵁
-	 */
-	@RequiresPermissions("test:testData:view")
-	@RequestMapping(value = "listData")
-	@ResponseBody
-	public Page<TestData> listData(TestData testData, HttpServletRequest request, HttpServletResponse response) {
-		testData.setPage(new Page<>(request, response));
-		Page<TestData> page = testDataService.findPage(testData);
-		return page;
-	}
-	
-	/**
-	 * 鏌ヨ瀛愯〃鍒楄〃鏁版嵁
-	 */
-	@RequiresPermissions("test:testData:view")
-	@RequestMapping(value = "subListData")
-	@ResponseBody
-	public List<TestDataChild> subListData(TestDataChild testDataChild) {
-		return testDataService.findSubList(testDataChild);
-	}
-
-	/**
-	 * 鏌ョ湅缂栬緫琛ㄥ崟
-	 */
-	@RequiresPermissions("test:testData:view")
-	@RequestMapping(value = "form")
-	public String form(TestData testData, Model model) {
-		model.addAttribute("testData", testData);
-		return "modules/test/testDataForm";
-	}
-
-	/**
-	 * 淇濆瓨鏁版嵁
-	 */
-	@RequiresPermissions("test:testData:edit")
-	@PostMapping(value = "save")
-	@ResponseBody
-	public String save(@Validated TestData testData) {
-		testDataService.save(testData);
-		return renderResult(Global.TRUE, text("淇濆瓨鏁版嵁鎴愬姛锛�"));
-	}
-	
-	/**
-	 * 鍋滅敤鏁版嵁
-	 */
-	@RequiresPermissions("test:testData:edit")
-	@RequestMapping(value = "disable")
-	@ResponseBody
-	public String disable(TestData testData) {
-		testData.setStatus(TestData.STATUS_DISABLE);
-		testDataService.updateStatus(testData);
-		return renderResult(Global.TRUE, text("鍋滅敤鏁版嵁鎴愬姛"));
-	}
-	
-	/**
-	 * 鍚敤鏁版嵁
-	 */
-	@RequiresPermissions("test:testData:edit")
-	@RequestMapping(value = "enable")
-	@ResponseBody
-	public String enable(TestData testData) {
-		testData.setStatus(TestData.STATUS_NORMAL);
-		testDataService.updateStatus(testData);
-		return renderResult(Global.TRUE, text("鍚敤鏁版嵁鎴愬姛"));
-	}
-	
-	/**
-	 * 鍒犻櫎鏁版嵁
-	 */
-	@RequiresPermissions("test:testData:edit")
-	@RequestMapping(value = "delete")
-	@ResponseBody
-	public String delete(TestData testData) {
-		testDataService.delete(testData);
-		return renderResult(Global.TRUE, text("鍒犻櫎鏁版嵁鎴愬姛锛�"));
-	}
-	
-	/**
-	 * 浜嬪姟娴嬭瘯
-	 */
-	@RequiresPermissions("test:testData:edit")
-	@RequestMapping(value = "transTest")
-	@ResponseBody
-	public String transTest(TestData testData) {
-		try{
-			testDataService.transTest(testData);
-		}catch (Exception e) {
-			logger.debug("浜嬪姟娴嬭瘯淇℃伅锛屾姤閿欏洖婊氾細" + e.getMessage());
-		}
-		boolean bl = testDataService.transValid(testData);
-		return renderResult(Global.TRUE, "浜嬪姟娴嬭瘯"+(bl?"鎴愬姛锛屾暟鎹凡":"澶辫触锛屾暟鎹湭")+"鍥炴粴锛�");
-	}
-	
-}
\ No newline at end of file
diff --git a/web-fast/db/h2/test.sql b/web-fast/db/h2/test.sql
deleted file mode 100644
index 11cf00cd..00000000
--- a/web-fast/db/h2/test.sql
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL,
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date datetime,
-	test_datetime datetime,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date datetime NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date datetime NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL,
-	test_sort int,
-	test_data_id varchar(64),
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date datetime,
-	test_datetime datetime,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	tree_name varchar(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date datetime NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date datetime NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (tree_code)
-);
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '娴嬭瘯鏁版嵁';
-COMMENT ON COLUMN test_data.id IS '缂栧彿';
-COMMENT ON COLUMN test_data.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON COLUMN test_data.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_data.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_data.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_data.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_data.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_data.remarks IS '澶囨敞淇℃伅';
-COMMENT ON TABLE test_data_child IS '娴嬭瘯鏁版嵁瀛愯〃';
-COMMENT ON COLUMN test_data_child.id IS '缂栧彿';
-COMMENT ON COLUMN test_data_child.test_sort IS '鎺掑簭鍙�';
-COMMENT ON COLUMN test_data_child.test_data_id IS '鐖惰〃涓婚敭';
-COMMENT ON COLUMN test_data_child.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data_child.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data_child.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data_child.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON TABLE test_tree IS '娴嬭瘯鏍戣〃';
-COMMENT ON COLUMN test_tree.tree_code IS '鑺傜偣缂栫爜';
-COMMENT ON COLUMN test_tree.parent_code IS '鐖剁骇缂栧彿';
-COMMENT ON COLUMN test_tree.parent_codes IS '鎵�鏈夌埗绾х紪鍙�';
-COMMENT ON COLUMN test_tree.tree_sort IS '鎺掑簭鍙凤紙鍗囧簭锛�';
-COMMENT ON COLUMN test_tree.tree_sorts IS '鎵�鏈夋帓搴忓彿';
-COMMENT ON COLUMN test_tree.tree_leaf IS '鏄惁鏈�鏈骇';
-COMMENT ON COLUMN test_tree.tree_level IS '灞傛绾у埆';
-COMMENT ON COLUMN test_tree.tree_names IS '鍏ㄨ妭鐐瑰悕';
-COMMENT ON COLUMN test_tree.tree_name IS '鑺傜偣鍚嶇О';
-COMMENT ON COLUMN test_tree.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_tree.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_tree.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_tree.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_tree.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_tree.remarks IS '澶囨敞淇℃伅';
-
-
-
diff --git a/web-fast/db/mssql/test.sql b/web-fast/db/mssql/test.sql
deleted file mode 100644
index 4ae8a769..00000000
--- a/web-fast/db/mssql/test.sql
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE [test_data]
-(
-	[id] varchar(64) NOT NULL,
-	[test_input] varchar(200),
-	[test_textarea] nvarchar(200),
-	[test_select] varchar(10),
-	[test_select_multiple] varchar(200),
-	[test_radio] varchar(10),
-	[test_checkbox] varchar(200),
-	[test_date] datetime,
-	[test_datetime] datetime,
-	[test_user_code] varchar(64),
-	[test_office_code] varchar(64),
-	[test_area_code] varchar(64),
-	[test_area_name] nvarchar(100),
-	[status] char(1) DEFAULT '0' NOT NULL,
-	[create_by] varchar(64) NOT NULL,
-	[create_date] datetime NOT NULL,
-	[update_by] varchar(64) NOT NULL,
-	[update_date] datetime NOT NULL,
-	[remarks] nvarchar(500),
-	PRIMARY KEY ([id])
-);
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE [test_data_child]
-(
-	[id] varchar(64) NOT NULL,
-	[test_sort] int,
-	[test_data_id] varchar(64),
-	[test_input] varchar(200),
-	[test_textarea] nvarchar(200),
-	[test_select] varchar(10),
-	[test_select_multiple] varchar(200),
-	[test_radio] varchar(10),
-	[test_checkbox] varchar(200),
-	[test_date] datetime,
-	[test_datetime] datetime,
-	[test_user_code] varchar(64),
-	[test_office_code] varchar(64),
-	[test_area_code] varchar(64),
-	[test_area_name] nvarchar(100),
-	PRIMARY KEY ([id])
-);
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE [test_tree]
-(
-	[tree_code] varchar(64) NOT NULL,
-	[parent_code] varchar(64) NOT NULL,
-	[parent_codes] varchar(767) NOT NULL,
-	[tree_sort] decimal(10) NOT NULL,
-	[tree_sorts] varchar(767) NOT NULL,
-	[tree_leaf] char(1) NOT NULL,
-	[tree_level] decimal(4) NOT NULL,
-	[tree_names] varchar(767) NOT NULL,
-	[tree_name] nvarchar(200) NOT NULL,
-	[status] char(1) DEFAULT '0' NOT NULL,
-	[create_by] varchar(64) NOT NULL,
-	[create_date] datetime NOT NULL,
-	[update_by] varchar(64) NOT NULL,
-	[update_date] datetime NOT NULL,
-	[remarks] nvarchar(500),
-	PRIMARY KEY ([tree_code])
-);
-
-
-
diff --git a/web-fast/db/mysql/create_user.sql b/web-fast/db/mysql/create_user.sql
deleted file mode 100644
index 7876ee92..00000000
--- a/web-fast/db/mysql/create_user.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-
--- 鎵撳紑 my.ini 缁� [mysqld] 澧炲姞濡備笅閰嶇疆锛�
--- sql_mode=ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
-
-set global read_only=0;
-
-create user 'jeesite'@'%' identified by 'jeesite';
-
-create database jeesite DEFAULT CHARSET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci';
-
-grant all privileges on jeesite.* to 'jeesite'@'%' identified by 'jeesite';
-
-flush privileges;
diff --git a/web-fast/db/mysql/test.sql b/web-fast/db/mysql/test.sql
deleted file mode 100644
index 06c78075..00000000
--- a/web-fast/db/mysql/test.sql
+++ /dev/null
@@ -1,76 +0,0 @@
-SET SESSION FOREIGN_KEY_CHECKS=0;
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL COMMENT '缂栧彿',
-	test_input varchar(200) COMMENT '鍗曡鏂囨湰',
-	test_textarea varchar(200) COMMENT '澶氳鏂囨湰',
-	test_select varchar(10) COMMENT '涓嬫媺妗�',
-	test_select_multiple varchar(200) COMMENT '涓嬫媺澶氶��',
-	test_radio varchar(10) COMMENT '鍗曢�夋',
-	test_checkbox varchar(200) COMMENT '澶嶉�夋',
-	test_date datetime COMMENT '鏃ユ湡閫夋嫨',
-	test_datetime datetime COMMENT '鏃ユ湡鏃堕棿',
-	test_user_code varchar(64) COMMENT '鐢ㄦ埛閫夋嫨',
-	test_office_code varchar(64) COMMENT '鏈烘瀯閫夋嫨',
-	test_area_code varchar(64) COMMENT '鍖哄煙閫夋嫨',
-	test_area_name varchar(100) COMMENT '鍖哄煙鍚嶇О',
-	status char(1) DEFAULT '0' NOT NULL COMMENT '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�',
-	create_by varchar(64) NOT NULL COMMENT '鍒涘缓鑰�',
-	create_date datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
-	update_by varchar(64) NOT NULL COMMENT '鏇存柊鑰�',
-	update_date datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
-	remarks varchar(500) COMMENT '澶囨敞淇℃伅',
-	PRIMARY KEY (id)
-) COMMENT = '娴嬭瘯鏁版嵁';
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL COMMENT '缂栧彿',
-	test_sort int COMMENT '鎺掑簭鍙�',
-	test_data_id varchar(64) COMMENT '鐖惰〃涓婚敭',
-	test_input varchar(200) COMMENT '鍗曡鏂囨湰',
-	test_textarea varchar(200) COMMENT '澶氳鏂囨湰',
-	test_select varchar(10) COMMENT '涓嬫媺妗�',
-	test_select_multiple varchar(200) COMMENT '涓嬫媺澶氶��',
-	test_radio varchar(10) COMMENT '鍗曢�夋',
-	test_checkbox varchar(200) COMMENT '澶嶉�夋',
-	test_date datetime COMMENT '鏃ユ湡閫夋嫨',
-	test_datetime datetime COMMENT '鏃ユ湡鏃堕棿',
-	test_user_code varchar(64) COMMENT '鐢ㄦ埛閫夋嫨',
-	test_office_code varchar(64) COMMENT '鏈烘瀯閫夋嫨',
-	test_area_code varchar(64) COMMENT '鍖哄煙閫夋嫨',
-	test_area_name varchar(100) COMMENT '鍖哄煙鍚嶇О',
-	PRIMARY KEY (id)
-) COMMENT = '娴嬭瘯鏁版嵁瀛愯〃';
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL COMMENT '鑺傜偣缂栫爜',
-	parent_code varchar(64) NOT NULL COMMENT '鐖剁骇缂栧彿',
-	parent_codes varchar(767) NOT NULL COMMENT '鎵�鏈夌埗绾х紪鍙�',
-	tree_sort decimal(10) NOT NULL COMMENT '鎺掑簭鍙凤紙鍗囧簭锛�',
-	tree_sorts varchar(767) NOT NULL COMMENT '鎵�鏈夋帓搴忓彿',
-	tree_leaf char(1) NOT NULL COMMENT '鏄惁鏈�鏈骇',
-	tree_level decimal(4) NOT NULL COMMENT '灞傛绾у埆',
-	tree_names varchar(767) NOT NULL COMMENT '鍏ㄨ妭鐐瑰悕',
-	tree_name varchar(200) NOT NULL COMMENT '鑺傜偣鍚嶇О',
-	status char(1) DEFAULT '0' NOT NULL COMMENT '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�',
-	create_by varchar(64) NOT NULL COMMENT '鍒涘缓鑰�',
-	create_date datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
-	update_by varchar(64) NOT NULL COMMENT '鏇存柊鑰�',
-	update_date datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
-	remarks varchar(500) COMMENT '澶囨敞淇℃伅',
-	PRIMARY KEY (tree_code)
-) COMMENT = '娴嬭瘯鏍戣〃';
-
-
-
diff --git a/web-fast/db/oracle/create_user.sql b/web-fast/db/oracle/create_user.sql
deleted file mode 100644
index 7ccd2411..00000000
--- a/web-fast/db/oracle/create_user.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-
-create user jeesite
-	identified by jeesite
-	quota unlimited on users;
-  
-grant connect,resource,create session,select any table,
-		create any view,create any table,create any index,
-		drop any table,drop any view,drop any index
-	to jeesite;
-	
--- 鎻愮ず oracle.jdbc.xa.OracleXAResource.recover 閿欒闇�瑕佹巿鏉冿細
-grant select on sys.dba_pending_transactions to jeesite;
-grant select on sys.pending_trans$ to jeesite;
-grant select on sys.dba_2pc_pending to jeesite;
-grant execute on sys.dbms_system to jeesite;
diff --git a/web-fast/db/oracle/test.sql b/web-fast/db/oracle/test.sql
deleted file mode 100644
index 4308d8d3..00000000
--- a/web-fast/db/oracle/test.sql
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar2(64) NOT NULL,
-	test_input varchar2(200),
-	test_textarea nvarchar2(200),
-	test_select varchar2(10),
-	test_select_multiple varchar2(200),
-	test_radio varchar2(10),
-	test_checkbox varchar2(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar2(64),
-	test_office_code varchar2(64),
-	test_area_code varchar2(64),
-	test_area_name nvarchar2(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar2(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar2(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks nvarchar2(500),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar2(64) NOT NULL,
-	test_sort number(10,0),
-	test_data_id varchar2(64),
-	test_input varchar2(200),
-	test_textarea nvarchar2(200),
-	test_select varchar2(10),
-	test_select_multiple varchar2(200),
-	test_radio varchar2(10),
-	test_checkbox varchar2(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar2(64),
-	test_office_code varchar2(64),
-	test_area_code varchar2(64),
-	test_area_name nvarchar2(100),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar2(64) NOT NULL,
-	parent_code varchar2(64) NOT NULL,
-	parent_codes varchar2(767) NOT NULL,
-	tree_sort number(10) NOT NULL,
-	tree_sorts varchar2(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level number(4) NOT NULL,
-	tree_names varchar2(767) NOT NULL,
-	tree_name nvarchar2(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar2(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar2(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks nvarchar2(500),
-	PRIMARY KEY (tree_code)
-);
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '娴嬭瘯鏁版嵁';
-COMMENT ON COLUMN test_data.id IS '缂栧彿';
-COMMENT ON COLUMN test_data.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON COLUMN test_data.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_data.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_data.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_data.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_data.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_data.remarks IS '澶囨敞淇℃伅';
-COMMENT ON TABLE test_data_child IS '娴嬭瘯鏁版嵁瀛愯〃';
-COMMENT ON COLUMN test_data_child.id IS '缂栧彿';
-COMMENT ON COLUMN test_data_child.test_sort IS '鎺掑簭鍙�';
-COMMENT ON COLUMN test_data_child.test_data_id IS '鐖惰〃涓婚敭';
-COMMENT ON COLUMN test_data_child.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data_child.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data_child.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data_child.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON TABLE test_tree IS '娴嬭瘯鏍戣〃';
-COMMENT ON COLUMN test_tree.tree_code IS '鑺傜偣缂栫爜';
-COMMENT ON COLUMN test_tree.parent_code IS '鐖剁骇缂栧彿';
-COMMENT ON COLUMN test_tree.parent_codes IS '鎵�鏈夌埗绾х紪鍙�';
-COMMENT ON COLUMN test_tree.tree_sort IS '鎺掑簭鍙凤紙鍗囧簭锛�';
-COMMENT ON COLUMN test_tree.tree_sorts IS '鎵�鏈夋帓搴忓彿';
-COMMENT ON COLUMN test_tree.tree_leaf IS '鏄惁鏈�鏈骇';
-COMMENT ON COLUMN test_tree.tree_level IS '灞傛绾у埆';
-COMMENT ON COLUMN test_tree.tree_names IS '鍏ㄨ妭鐐瑰悕';
-COMMENT ON COLUMN test_tree.tree_name IS '鑺傜偣鍚嶇О';
-COMMENT ON COLUMN test_tree.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_tree.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_tree.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_tree.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_tree.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_tree.remarks IS '澶囨敞淇℃伅';
-
-
-
diff --git a/web-fast/db/postgresql/test.sql b/web-fast/db/postgresql/test.sql
deleted file mode 100644
index 54758d68..00000000
--- a/web-fast/db/postgresql/test.sql
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL,
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (id)
-) WITHOUT OIDS;
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL,
-	test_sort int,
-	test_data_id varchar(64),
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	PRIMARY KEY (id)
-) WITHOUT OIDS;
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	tree_name varchar(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (tree_code)
-) WITHOUT OIDS;
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '娴嬭瘯鏁版嵁';
-COMMENT ON COLUMN test_data.id IS '缂栧彿';
-COMMENT ON COLUMN test_data.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON COLUMN test_data.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_data.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_data.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_data.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_data.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_data.remarks IS '澶囨敞淇℃伅';
-COMMENT ON TABLE test_data_child IS '娴嬭瘯鏁版嵁瀛愯〃';
-COMMENT ON COLUMN test_data_child.id IS '缂栧彿';
-COMMENT ON COLUMN test_data_child.test_sort IS '鎺掑簭鍙�';
-COMMENT ON COLUMN test_data_child.test_data_id IS '鐖惰〃涓婚敭';
-COMMENT ON COLUMN test_data_child.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data_child.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data_child.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data_child.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON TABLE test_tree IS '娴嬭瘯鏍戣〃';
-COMMENT ON COLUMN test_tree.tree_code IS '鑺傜偣缂栫爜';
-COMMENT ON COLUMN test_tree.parent_code IS '鐖剁骇缂栧彿';
-COMMENT ON COLUMN test_tree.parent_codes IS '鎵�鏈夌埗绾х紪鍙�';
-COMMENT ON COLUMN test_tree.tree_sort IS '鎺掑簭鍙凤紙鍗囧簭锛�';
-COMMENT ON COLUMN test_tree.tree_sorts IS '鎵�鏈夋帓搴忓彿';
-COMMENT ON COLUMN test_tree.tree_leaf IS '鏄惁鏈�鏈骇';
-COMMENT ON COLUMN test_tree.tree_level IS '灞傛绾у埆';
-COMMENT ON COLUMN test_tree.tree_names IS '鍏ㄨ妭鐐瑰悕';
-COMMENT ON COLUMN test_tree.tree_name IS '鑺傜偣鍚嶇О';
-COMMENT ON COLUMN test_tree.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_tree.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_tree.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_tree.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_tree.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_tree.remarks IS '澶囨敞淇℃伅';
-
-
-
diff --git a/web-fast/db/test.erm b/web-fast/db/test.erm
deleted file mode 100644
index 9354e409..00000000
--- a/web-fast/db/test.erm
+++ /dev/null
@@ -1,3590 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<diagram>
-	<page_setting>
-		<direction_horizontal>true</direction_horizontal>
-		<scale>100</scale>
-		<paper_size>A4 210 x 297 mm</paper_size>
-		<top_margin>30</top_margin>
-		<left_margin>30</left_margin>
-		<bottom_margin>30</bottom_margin>
-		<right_margin>30</right_margin>
-	</page_setting>
-	<category_index>0</category_index>
-	<zoom>1.0</zoom>
-	<x>0</x>
-	<y>0</y>
-	<default_color>
-		<r>128</r>
-		<g>128</g>
-		<b>192</b>
-	</default_color>
-	<color>
-		<r>255</r>
-		<g>255</g>
-		<b>255</b>
-	</color>
-	<font_name>Arial</font_name>
-	<font_size>14</font_size>
-	<settings>
-		<database>StandardSQL</database>
-		<capital>false</capital>
-		<table_style></table_style>
-		<notation></notation>
-		<notation_level>0</notation_level>
-		<notation_expand_group>true</notation_expand_group>
-		<view_mode>2</view_mode>
-		<outline_view_mode>1</outline_view_mode>
-		<view_order_by>1</view_order_by>
-		<auto_ime_change>false</auto_ime_change>
-		<validate_physical_name>true</validate_physical_name>
-		<use_bezier_curve>false</use_bezier_curve>
-		<suspend_validator>false</suspend_validator>
-		<export_setting>
-			<export_ddl_setting>
-				<output_path>db/test.sql</output_path>
-				<encoding>UTF-8</encoding>
-				<line_feed>CR+LF</line_feed>
-				<is_open_after_saved>false</is_open_after_saved>
-				<environment_id>7be191506f9daa8070b3ac14921dffd44063d2bb</environment_id>
-				<category_id>null</category_id>
-				<ddl_target>
-					<create_comment>true</create_comment>
-					<create_foreignKey>false</create_foreignKey>
-					<create_index>true</create_index>
-					<create_sequence>false</create_sequence>
-					<create_table>true</create_table>
-					<create_tablespace>false</create_tablespace>
-					<create_trigger>false</create_trigger>
-					<create_view>false</create_view>
-					<drop_index>false</drop_index>
-					<drop_sequence>false</drop_sequence>
-					<drop_table>false</drop_table>
-					<drop_tablespace>false</drop_tablespace>
-					<drop_trigger>false</drop_trigger>
-					<drop_view>false</drop_view>
-					<inline_column_comment>false</inline_column_comment>
-					<inline_table_comment>true</inline_table_comment>
-					<comment_value_description>false</comment_value_description>
-					<comment_value_logical_name>true</comment_value_logical_name>
-					<comment_value_logical_name_description>false</comment_value_logical_name_description>
-					<comment_replace_line_feed>false</comment_replace_line_feed>
-					<comment_replace_string></comment_replace_string>
-				</ddl_target>
-			</export_ddl_setting>
-			<export_excel_setting>
-				<category_id>null</category_id>
-				<output_path>db/test.xls</output_path>
-				<template></template>
-				<template_path></template_path>
-				<used_default_template_lang>en</used_default_template_lang>
-				<image_output></image_output>
-				<is_open_after_saved>true</is_open_after_saved>
-				<is_put_diagram>true</is_put_diagram>
-				<is_use_logical_name>true</is_use_logical_name>
-			</export_excel_setting>
-			<export_html_setting>
-				<output_dir></output_dir>
-				<with_category_image>true</with_category_image>
-				<with_image>true</with_image>
-				<is_open_after_saved>true</is_open_after_saved>
-			</export_html_setting>
-			<export_image_setting>
-				<output_file_path>db/test.png</output_file_path>
-				<category_dir_path></category_dir_path>
-				<with_category_image>true</with_category_image>
-				<is_open_after_saved>true</is_open_after_saved>
-			</export_image_setting>
-			<export_java_setting>
-				<java_output></java_output>
-				<package_name></package_name>
-				<class_name_suffix></class_name_suffix>
-				<src_file_encoding></src_file_encoding>
-				<with_hibernate>false</with_hibernate>
-			</export_java_setting>
-			<export_testdata_setting>
-				<file_encoding></file_encoding>
-				<file_path></file_path>
-				<format>0</format>
-			</export_testdata_setting>
-		</export_setting>
-		<category_settings>
-			<free_layout>false</free_layout>
-			<show_referred_tables>false</show_referred_tables>
-			<categories>
-			</categories>
-		</category_settings>
-		<translation_settings>
-			<use>false</use>
-			<translations>
-			</translations>
-		</translation_settings>
-		<model_properties>
-			<id></id>
-			<height>-1</height>
-			<width>-1</width>
-				<font_name>Arial</font_name>
-				<font_size>14</font_size>
-			<x>50</x>
-			<y>50</y>
-			<color>
-				<r>255</r>
-				<g>255</g>
-				<b>255</b>
-			</color>
-			<connections>
-			</connections>
-			<display>false</display>
-			<creation_date>2016-12-25 17:25:00</creation_date>
-			<model_property>
-				<name>Project Name</name>
-				<value></value>
-			</model_property>
-			<model_property>
-				<name>Model Name</name>
-				<value></value>
-			</model_property>
-			<model_property>
-				<name>Version</name>
-				<value></value>
-			</model_property>
-			<model_property>
-				<name>Company</name>
-				<value></value>
-			</model_property>
-			<model_property>
-				<name>Author</name>
-				<value></value>
-			</model_property>
-		</model_properties>
-		<table_properties>
-			<schema></schema>
-		</table_properties>
-		<environment_setting>
-			<environment>
-				<id>7be191506f9daa8070b3ac14921dffd44063d2bb</id>
-				<name>Default</name>
-			</environment>
-		</environment_setting>
-	</settings>
-	<dictionary>
-		<word>
-			<id>c71533e4d2f429ff8466fd6a8de5719f1741377b</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description>绉熸埛浠ｇ爜</description>
-			<logical_name>绉熸埛浠ｇ爜</logical_name>
-			<physical_name>corp_code</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>11c59294fe142d108ca4dac5a03033f50188a450</id>
-			<length>100</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description>绉熸埛鍚嶇О</description>
-			<logical_name>绉熸埛鍚嶇О</logical_name>
-			<physical_name>corp_name</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>f60ca81cf3f5c08c518d0266d2b8fd1b219a9802</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鍒涘缓鑰�</logical_name>
-			<physical_name>create_by</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>170410257b4d8e712b8c1d499b415de82ce9683c</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鍒涘缓鏃堕棿</logical_name>
-			<physical_name>create_date</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>038ea74a700b763fa1f8fcdbd2c27e7941f82f7a</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Date 1</logical_name>
-			<physical_name>extend_d1</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>19aa2e40abff2bb4e908f18f5f5e5b30a074cd8b</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Date 2</logical_name>
-			<physical_name>extend_d2</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>06f59428b50e62e636a58a2f3cbcee2c75764506</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Date 3</logical_name>
-			<physical_name>extend_d3</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>8f08aeb4b9ceb072f0232d3d23fd5371ef8f379c</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Date 4</logical_name>
-			<physical_name>extend_d4</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>0733a829c52af8af725ace50d4ed3e0179969f56</id>
-			<length>19</length>
-			<decimal>4</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Float 1</logical_name>
-			<physical_name>extend_f1</physical_name>
-			<type>decimal(p,s)</type>
-		</word>
-		<word>
-			<id>0b7230df29d6df213507c8855d019d2d55c9a561</id>
-			<length>19</length>
-			<decimal>4</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Float 2</logical_name>
-			<physical_name>extend_f2</physical_name>
-			<type>decimal(p,s)</type>
-		</word>
-		<word>
-			<id>6cb3dad83f3e1f358155892dcee3167ef55bacc7</id>
-			<length>19</length>
-			<decimal>4</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Float 3</logical_name>
-			<physical_name>extend_f3</physical_name>
-			<type>decimal(p,s)</type>
-		</word>
-		<word>
-			<id>e54b261fc7ab81e0ef19a89e657453664abe5593</id>
-			<length>19</length>
-			<decimal>4</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Float 4</logical_name>
-			<physical_name>extend_f4</physical_name>
-			<type>decimal(p,s)</type>
-		</word>
-		<word>
-			<id>b67071354a8d43cabe9a0ac29303f8b144a15985</id>
-			<length>19</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Integer 1</logical_name>
-			<physical_name>extend_i1</physical_name>
-			<type>decimal(p)</type>
-		</word>
-		<word>
-			<id>70b8240f049f658b97394b7d4784481fdb477f5c</id>
-			<length>19</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Integer 2</logical_name>
-			<physical_name>extend_i2</physical_name>
-			<type>decimal(p)</type>
-		</word>
-		<word>
-			<id>ce377c081415847061b2efc58b701ff847dcaaca</id>
-			<length>19</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Integer 3</logical_name>
-			<physical_name>extend_i3</physical_name>
-			<type>decimal(p)</type>
-		</word>
-		<word>
-			<id>fb96f6dc60d31576c278a3c64024154eda67d3fe</id>
-			<length>19</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Integer 4</logical_name>
-			<physical_name>extend_i4</physical_name>
-			<type>decimal(p)</type>
-		</word>
-		<word>
-			<id>3962f4b130a803841a193a163e42679946b5ae1f</id>
-			<length>1000</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 JSON</logical_name>
-			<physical_name>extend_json</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>b1acb2df17677e0ed818dea6e1150bfc088fcd50</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 1</logical_name>
-			<physical_name>extend_s1</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>d27290b84b207a7c87f4d78d80e62048c67fac04</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 2</logical_name>
-			<physical_name>extend_s2</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>5e25d7f0e327d2d760a04b32140b639bb96bfd8d</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 3</logical_name>
-			<physical_name>extend_s3</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>d05572af90653d4ddfd880402a15ed9b27c81888</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 4</logical_name>
-			<physical_name>extend_s4</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>acc372d31709a1133f6c13fc8abfef7881ca26ed</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 5</logical_name>
-			<physical_name>extend_s5</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>59763a16504e4136a7a2fbed38476272d337105c</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 6</logical_name>
-			<physical_name>extend_s6</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>600b96b04bf4f65919eabfc6613d3c5e370931e1</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 7</logical_name>
-			<physical_name>extend_s7</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>a9dc80e5c484dc7b9d5fff9294eaa383819edc26</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 8</logical_name>
-			<physical_name>extend_s8</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>e3325b6b7dc29b87da73eedcfff2a9c4cd245579</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>缂栧彿</logical_name>
-			<physical_name>id</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>e4465172e2cc64907a386237cc7d0c7d79a074dc</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鐖剁骇缂栧彿</logical_name>
-			<physical_name>parent_code</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>b4f9837136b0a84afc9a611a563fb51141fdac1f</id>
-			<length>767</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵�鏈夌埗绾х紪鍙�</logical_name>
-			<physical_name>parent_codes</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>1a77879eeba6dd8a2ca8de0ca0cbd6db5ddeb7af</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>澶囨敞淇℃伅</logical_name>
-			<physical_name>remarks</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>a5d0a391d0d09acab89c829d271b0a96a7058ca0</id>
-			<length>1</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤 3鍐荤粨 4瀹℃牳 5椹冲洖 9鑽夌ǹ锛�</logical_name>
-			<physical_name>status</physical_name>
-			<type>character(n)</type>
-		</word>
-		<word>
-			<id>70d065a29d01e3875167a20441e0ebbfaf5a05f8</id>
-			<length>1</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�</logical_name>
-			<physical_name>status</physical_name>
-			<type>character(n)</type>
-		</word>
-		<word>
-			<id>5f188d6afcf9d1afbbe94ac6d92f800caef67cbe</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鍖哄煙閫夋嫨</logical_name>
-			<physical_name>test_area_code</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>6adbc087f6a7805c1d979bee36098c497d399378</id>
-			<length>100</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鍖哄煙鍚嶇О</logical_name>
-			<physical_name>test_area_name</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>5cab10f2b339972b1f10cb150baf883a8adffdbb</id>
-			<length>200</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>澶嶉�夋</logical_name>
-			<physical_name>test_checkbox</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>80c7c6394e75c6f7acbf75bae587afdc02d3990b</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鐖惰〃涓婚敭</logical_name>
-			<physical_name>test_data_id</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>7b4cc71483ef98673d4cc313eb99314e27722e28</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鏃ユ湡閫夋嫨</logical_name>
-			<physical_name>test_date</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>bc2e5b104e72723c9c6710c9a3a02804111b6846</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鏃ユ湡鏃堕棿</logical_name>
-			<physical_name>test_datetime</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>89d26a106a3b0895ebfe6ccf9b5930ef4b1612c1</id>
-			<length>200</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鍗曡鏂囨湰</logical_name>
-			<physical_name>test_input</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>efa0f7e9084cf3b09f7e31101ec496a44aadaaa4</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鏈烘瀯閫夋嫨</logical_name>
-			<physical_name>test_office_code</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>7b62803aab5f5a3c3f9ff63f7d5122a9ef3a41bb</id>
-			<length>10</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鍗曢�夋</logical_name>
-			<physical_name>test_radio</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>3a0f10db94ed1cb6e8cb088ca0275b664d4fca4c</id>
-			<length>10</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>涓嬫媺妗�</logical_name>
-			<physical_name>test_select</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>cb6ff93372480fd7d11e66a1e9c9fa028149e99c</id>
-			<length>200</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>涓嬫媺澶氶��</logical_name>
-			<physical_name>test_select_multiple</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>f1929c4074c74e32b7e4ac70c95476add194c0a0</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎺掑簭鍙�</logical_name>
-			<physical_name>test_sort</physical_name>
-			<type>integer</type>
-		</word>
-		<word>
-			<id>c22eb21bd16761440f79d8782099fa4b0e9115cb</id>
-			<length>200</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>澶氳鏂囨湰</logical_name>
-			<physical_name>test_textarea</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>54338e0229264fd01ec1efff7c49b30d966df58e</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鐢ㄦ埛閫夋嫨</logical_name>
-			<physical_name>test_user_code</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>abe7e075aa224d4322d021e5659d170e0a927621</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鑺傜偣缂栫爜</logical_name>
-			<physical_name>tree_code</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>8fb086ad8b2a35cdf18c1a1e247005cdb140faf0</id>
-			<length>1</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鏄惁鏈�鏈骇</logical_name>
-			<physical_name>tree_leaf</physical_name>
-			<type>character(n)</type>
-		</word>
-		<word>
-			<id>f22022df4ccf9c7081b4d8f98deed04c1d8c987c</id>
-			<length>4</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>灞傛绾у埆</logical_name>
-			<physical_name>tree_level</physical_name>
-			<type>decimal(p)</type>
-		</word>
-		<word>
-			<id>b023ebdb5c45aa960edd4a77dbe90dcdcc346664</id>
-			<length>200</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鑺傜偣鍚嶇О</logical_name>
-			<physical_name>tree_name</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>44f852382fba107fe668304530dea0233f38a321</id>
-			<length>767</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鍏ㄨ妭鐐瑰悕</logical_name>
-			<physical_name>tree_names</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>65265fefa00907a60e8fe2ebd6d2ad58760415e5</id>
-			<length>10</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎺掑簭鍙凤紙鍗囧簭锛�</logical_name>
-			<physical_name>tree_sort</physical_name>
-			<type>decimal(p)</type>
-		</word>
-		<word>
-			<id>cf5f1e3cc5cc0869f539c3c5b2adf05677e367b8</id>
-			<length>767</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵�鏈夋帓搴忓彿</logical_name>
-			<physical_name>tree_sorts</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>c60616703cf07aaf21f84215d092e2101efb9bca</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鏇存柊鑰�</logical_name>
-			<physical_name>update_by</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>b5c3a59170184a01c15c78a6778cb73083fe6321</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鏇存柊鏃堕棿</logical_name>
-			<physical_name>update_date</physical_name>
-			<type>datetime</type>
-		</word>
-	</dictionary>
-	<tablespace_set>
-	</tablespace_set>
-	<contents>
-		<table>
-			<id>e553474c37270813e70025e433a4cf8a64653e13</id>
-			<height>438</height>
-			<width>387</width>
-				<font_name>Arial</font_name>
-				<font_size>14</font_size>
-			<x>864</x>
-			<y>36</y>
-			<color>
-				<r>128</r>
-				<g>128</g>
-				<b>192</b>
-			</color>
-			<connections>
-			</connections>
-			<physical_name>test_tree</physical_name>
-			<logical_name>娴嬭瘯鏍戣〃</logical_name>
-			<description></description>
-			<constraint></constraint>
-			<primary_key_name></primary_key_name>
-			<option></option>
-			<columns>
-				<normal_column>
-					<word_id>abe7e075aa224d4322d021e5659d170e0a927621</word_id>
-					<id>7e417ee9d0dd69c767a5853922621946ed4fb2d8</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>true</not_null>
-					<primary_key>true</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<column_group>a535b6c506004a7fdf4d48984c9ff2cfa59c157a</column_group>
-				<normal_column>
-					<word_id>b023ebdb5c45aa960edd4a77dbe90dcdcc346664</word_id>
-					<id>39f501890586173d229e83610cfbfaa6e3a85374</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>nvarchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>true</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<column_group>35ae805d1da92afdb99b2fe8c536d1649356fccd</column_group>
-			</columns>
-			<indexes>
-			</indexes>
-			<complex_unique_key_list>
-			</complex_unique_key_list>
-			<table_properties>
-				<schema></schema>
-			</table_properties>
-		</table>
-		<table>
-			<id>5435ef11ea53f170fe3491b199c113e47932e175</id>
-			<height>401</height>
-			<width>320</width>
-				<font_name>Arial</font_name>
-				<font_size>14</font_size>
-			<x>36</x>
-			<y>36</y>
-			<color>
-				<r>128</r>
-				<g>128</g>
-				<b>192</b>
-			</color>
-			<connections>
-			</connections>
-			<physical_name>test_data</physical_name>
-			<logical_name>娴嬭瘯鏁版嵁</logical_name>
-			<description></description>
-			<constraint></constraint>
-			<primary_key_name></primary_key_name>
-			<option></option>
-			<columns>
-				<normal_column>
-					<word_id>e3325b6b7dc29b87da73eedcfff2a9c4cd245579</word_id>
-					<id>d82778c36626013cd39fd790da6f55a9762f0c76</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>true</not_null>
-					<primary_key>true</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>89d26a106a3b0895ebfe6ccf9b5930ef4b1612c1</word_id>
-					<id>3e14b40dc07c134329a40752973acfad2ffdc48b</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>c22eb21bd16761440f79d8782099fa4b0e9115cb</word_id>
-					<id>8050d948828b16267482e9e3716219321f206b81</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>nvarchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>3a0f10db94ed1cb6e8cb088ca0275b664d4fca4c</word_id>
-					<id>3664605e054c39531ca8e91aa4463c955a993357</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>cb6ff93372480fd7d11e66a1e9c9fa028149e99c</word_id>
-					<id>f7b189ecdc92c78bfaae9c736318ab6a5aedd396</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>7b62803aab5f5a3c3f9ff63f7d5122a9ef3a41bb</word_id>
-					<id>6e4837ab55b592669ccc7ebfc8b1ed96a00607b3</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>5cab10f2b339972b1f10cb150baf883a8adffdbb</word_id>
-					<id>9fb81bdc12ed017f62e9dd4529025e536eff7f08</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>7b4cc71483ef98673d4cc313eb99314e27722e28</word_id>
-					<id>9d9478798ed2766a81b0e5a8a022eb89d9c5cc34</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>datetime</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>bc2e5b104e72723c9c6710c9a3a02804111b6846</word_id>
-					<id>c131dc5cb7ce6f1aa5e8d5f86f2002c8ae1bb8f6</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>datetime</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>54338e0229264fd01ec1efff7c49b30d966df58e</word_id>
-					<id>cfe3c330968a9a824c2cf933b227887d3e9615ac</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>efa0f7e9084cf3b09f7e31101ec496a44aadaaa4</word_id>
-					<id>23041cb30875514136904ea11043c7ea1924f048</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>5f188d6afcf9d1afbbe94ac6d92f800caef67cbe</word_id>
-					<id>b6d5dc8745c0fa484ed6f14e90a42282ca1b285d</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>6adbc087f6a7805c1d979bee36098c497d399378</word_id>
-					<id>d244401ff7302bb5b75092016531952d093b238b</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>nvarchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<column_group>35ae805d1da92afdb99b2fe8c536d1649356fccd</column_group>
-			</columns>
-			<indexes>
-			</indexes>
-			<complex_unique_key_list>
-			</complex_unique_key_list>
-			<table_properties>
-				<schema></schema>
-			</table_properties>
-		</table>
-		<table>
-			<id>5a836e654b7b7d19f102e87336fefa079d98a2e6</id>
-			<height>438</height>
-			<width>346</width>
-				<font_name>Arial</font_name>
-				<font_size>14</font_size>
-			<x>468</x>
-			<y>36</y>
-			<color>
-				<r>128</r>
-				<g>128</g>
-				<b>192</b>
-			</color>
-			<connections>
-			</connections>
-			<physical_name>test_data_child</physical_name>
-			<logical_name>娴嬭瘯鏁版嵁瀛愯〃</logical_name>
-			<description></description>
-			<constraint></constraint>
-			<primary_key_name></primary_key_name>
-			<option></option>
-			<columns>
-				<normal_column>
-					<word_id>e3325b6b7dc29b87da73eedcfff2a9c4cd245579</word_id>
-					<id>34477707bcf8a7810e12e9565aff085f6fb1e0ad</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>true</not_null>
-					<primary_key>true</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>f1929c4074c74e32b7e4ac70c95476add194c0a0</word_id>
-					<id>ec8a047dffe3cf2e4d95ba3e26c3bac0382d95c9</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>integer</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>80c7c6394e75c6f7acbf75bae587afdc02d3990b</word_id>
-					<id>b095c44611ed08156277676d9a3a0ce52b9b05ef</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>89d26a106a3b0895ebfe6ccf9b5930ef4b1612c1</word_id>
-					<id>78715aa66a10a9b190ad69b8ed792e9a2f4946e3</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>c22eb21bd16761440f79d8782099fa4b0e9115cb</word_id>
-					<id>693f8af2fe6cf45255b6f2bc7e9077f3630c3dd8</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>nvarchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>3a0f10db94ed1cb6e8cb088ca0275b664d4fca4c</word_id>
-					<id>04216c384533b70b8e86b571fa2beef7157bab5a</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>cb6ff93372480fd7d11e66a1e9c9fa028149e99c</word_id>
-					<id>0b6f63094be90aa8674460cce26be10327827ceb</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>7b62803aab5f5a3c3f9ff63f7d5122a9ef3a41bb</word_id>
-					<id>363e8cfcf4a6b228e656decadacba29280906555</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>5cab10f2b339972b1f10cb150baf883a8adffdbb</word_id>
-					<id>7875aa5fee3d6f9587180fb8fce9343a56cdc34e</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>7b4cc71483ef98673d4cc313eb99314e27722e28</word_id>
-					<id>61c49a2f7807c55c8f85110c30889d5b403e4b04</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>datetime</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>bc2e5b104e72723c9c6710c9a3a02804111b6846</word_id>
-					<id>b91171b99f3628aadb0e6986fbfa30cc547b280e</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>datetime</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>54338e0229264fd01ec1efff7c49b30d966df58e</word_id>
-					<id>9f33d190101e56f93f5ece0fd7c5cdda3e704b4c</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>efa0f7e9084cf3b09f7e31101ec496a44aadaaa4</word_id>
-					<id>16121b5aa08fc170883408ec2d0487281a132d9d</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>5f188d6afcf9d1afbbe94ac6d92f800caef67cbe</word_id>
-					<id>1afc7f146271f5c90ea811aa24c08ce25d12552e</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>6adbc087f6a7805c1d979bee36098c497d399378</word_id>
-					<id>343f0db997b913f299b0496c4306d3617ad708de</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>nvarchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-			</columns>
-			<indexes>
-			</indexes>
-			<complex_unique_key_list>
-			</complex_unique_key_list>
-			<table_properties>
-				<schema></schema>
-			</table_properties>
-		</table>
-	</contents>
-	<column_groups>
-			<column_group>
-				<id>845c82ebd869d5620b1ef2c2b6f438b11a045082</id>
-				<group_name>BaseEntity</group_name>
-				<columns>
-					<normal_column>
-						<word_id>e3325b6b7dc29b87da73eedcfff2a9c4cd245579</word_id>
-						<id>02ecedc0de5850cba25bc91919ed39d414b74111</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>a5d0a391d0d09acab89c829d271b0a96a7058ca0</word_id>
-						<id>2fe6a36385238c1b21c76deae00a7afa00ff5538</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>character(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-				</columns>
-			</column_group>
-			<column_group>
-				<id>ea920cba2fe0eaee64a2310ece7cda4b198b37ec</id>
-				<group_name>BaseEntityCorp</group_name>
-				<columns>
-					<normal_column>
-						<word_id>c71533e4d2f429ff8466fd6a8de5719f1741377b</word_id>
-						<id>b8ea4b73d6d32a222e5abfd453287575ae518480</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value>0</default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>11c59294fe142d108ca4dac5a03033f50188a450</word_id>
-						<id>b94f5fe344185c40739cf93d1090686001bb11e0</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value>JeeSite</default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-				</columns>
-			</column_group>
-			<column_group>
-				<id>35ae805d1da92afdb99b2fe8c536d1649356fccd</id>
-				<group_name>DataEntity</group_name>
-				<columns>
-					<normal_column>
-						<word_id>70d065a29d01e3875167a20441e0ebbfaf5a05f8</word_id>
-						<id>f0036584bd8711715579d21994a0105935605a7e</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>character(n)</type>
-						<constraint></constraint>
-						<default_value>0</default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>f60ca81cf3f5c08c518d0266d2b8fd1b219a9802</word_id>
-						<id>c391a15752a8eb58bc558a39d1b431f7ee125e0e</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>170410257b4d8e712b8c1d499b415de82ce9683c</word_id>
-						<id>e2e82ba86e15fd67397355e711255b1625078ae1</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>c60616703cf07aaf21f84215d092e2101efb9bca</word_id>
-						<id>fd0546fc2d4e01c35dcbc23913add68a99fabd73</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>b5c3a59170184a01c15c78a6778cb73083fe6321</word_id>
-						<id>f8ea4fc4a778a0b94398a661a1ed8608f0e8d28d</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>1a77879eeba6dd8a2ca8de0ca0cbd6db5ddeb7af</word_id>
-						<id>69e01b6d4f42df40a09540ef4ba10ed8e006abaa</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-				</columns>
-			</column_group>
-			<column_group>
-				<id>85024a2953cf3e3c9c1cce49b2351853ab0d125b</id>
-				<group_name>DataEntityNoStatus</group_name>
-				<columns>
-					<normal_column>
-						<word_id>f60ca81cf3f5c08c518d0266d2b8fd1b219a9802</word_id>
-						<id>e5355faba5ec3c9128507dd4c48ea9230631cf83</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>170410257b4d8e712b8c1d499b415de82ce9683c</word_id>
-						<id>6bed374c39d181003a4f92d76d79a4119176ba0c</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>c60616703cf07aaf21f84215d092e2101efb9bca</word_id>
-						<id>f9db19bb567760bbdd554d75bbfdc891c89f9da9</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>b5c3a59170184a01c15c78a6778cb73083fe6321</word_id>
-						<id>ee78b079f7d319bf8119fd01439cd97424ff49fa</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>1a77879eeba6dd8a2ca8de0ca0cbd6db5ddeb7af</word_id>
-						<id>f7b88ecec0ef386bb384c228842a7587432112fb</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-				</columns>
-			</column_group>
-			<column_group>
-				<id>118dab95fc1f792cd468b9f66af2d4fabd98c39b</id>
-				<group_name>ExtendEntity</group_name>
-				<columns>
-					<normal_column>
-						<word_id>b1acb2df17677e0ed818dea6e1150bfc088fcd50</word_id>
-						<id>6ccadddab6ce48441ca7abd798cda6f3debf4a0c</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>d27290b84b207a7c87f4d78d80e62048c67fac04</word_id>
-						<id>93ab0ba3b47b01934614dbd3e572358c9f99e6ea</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>5e25d7f0e327d2d760a04b32140b639bb96bfd8d</word_id>
-						<id>a78c7961910a5e697027d1a3530b1afaa8ea8c94</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>d05572af90653d4ddfd880402a15ed9b27c81888</word_id>
-						<id>40085364ec7a58653e96f8659aadd258d7556bc7</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>acc372d31709a1133f6c13fc8abfef7881ca26ed</word_id>
-						<id>9787d7fe93ee31c5b4979fd620ff6e4b2777eccf</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>59763a16504e4136a7a2fbed38476272d337105c</word_id>
-						<id>95c55b81b7e9e1a9bb01aa3d88fb90c648641c4e</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>600b96b04bf4f65919eabfc6613d3c5e370931e1</word_id>
-						<id>16f44dfc7964796f109293bc49afd58dcb4eec1f</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>a9dc80e5c484dc7b9d5fff9294eaa383819edc26</word_id>
-						<id>39b1dffa083f74afc30df621845cf7f0ed71394f</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>b67071354a8d43cabe9a0ac29303f8b144a15985</word_id>
-						<id>7584cc6360ae7edc99e1f619042eba5865b2c4c7</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>70b8240f049f658b97394b7d4784481fdb477f5c</word_id>
-						<id>f0b5383e05c6b3f6e5f65b33b33009826c83d014</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>ce377c081415847061b2efc58b701ff847dcaaca</word_id>
-						<id>260d5f31009fff18000d1e64f4f877926e621306</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>fb96f6dc60d31576c278a3c64024154eda67d3fe</word_id>
-						<id>a83144f40e7ae64e46a4b4ed651379774a953b17</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>0733a829c52af8af725ace50d4ed3e0179969f56</word_id>
-						<id>2a5203a275171a250870cf6cb224a910aa9354ec</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p,s)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>0b7230df29d6df213507c8855d019d2d55c9a561</word_id>
-						<id>3ef5bd65a7dcd74b9a9d8a292ec395f66b7de32b</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p,s)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>6cb3dad83f3e1f358155892dcee3167ef55bacc7</word_id>
-						<id>01d0849bdda56a8d8f24befdadc3fc9b007ae92b</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p,s)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>e54b261fc7ab81e0ef19a89e657453664abe5593</word_id>
-						<id>1c8ed63d72f40f0fe2f05815675771bdf3f824f8</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p,s)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>038ea74a700b763fa1f8fcdbd2c27e7941f82f7a</word_id>
-						<id>2b49e875138bfb329aaa352629650b7881435123</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>19aa2e40abff2bb4e908f18f5f5e5b30a074cd8b</word_id>
-						<id>5c6ec16226d85b0411b7077cb9a6e0c7aa8d74d1</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>06f59428b50e62e636a58a2f3cbcee2c75764506</word_id>
-						<id>d92b8f7fa7a2be49c7f00c447a603b136e84261d</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>8f08aeb4b9ceb072f0232d3d23fd5371ef8f379c</word_id>
-						<id>095a76f07a3cd2bdc6cc442757c11012e1974f4a</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>3962f4b130a803841a193a163e42679946b5ae1f</word_id>
-						<id>42c5d8f490f69b93e77698efa030ca23988ae696</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-				</columns>
-			</column_group>
-			<column_group>
-				<id>a535b6c506004a7fdf4d48984c9ff2cfa59c157a</id>
-				<group_name>TreeEntity</group_name>
-				<columns>
-					<normal_column>
-						<word_id>e4465172e2cc64907a386237cc7d0c7d79a074dc</word_id>
-						<id>394369b90c0a5b6efeed3cf823c642605d7a1653</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>b4f9837136b0a84afc9a611a563fb51141fdac1f</word_id>
-						<id>e8d877396943acfec73023dba2c1c6e3d7802d62</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>65265fefa00907a60e8fe2ebd6d2ad58760415e5</word_id>
-						<id>23f973124aedd0244533f4e7b3b103c548b966be</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>cf5f1e3cc5cc0869f539c3c5b2adf05677e367b8</word_id>
-						<id>984d5eac2b3221118a61655e4a5a49c78e0f0151</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>8fb086ad8b2a35cdf18c1a1e247005cdb140faf0</word_id>
-						<id>b2f246a3f0ade317eaa9915e2fd539abae5a5ec8</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>character(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>f22022df4ccf9c7081b4d8f98deed04c1d8c987c</word_id>
-						<id>f5a9968479420f08da2e98d21136b3ed4b6e396f</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>44f852382fba107fe668304530dea0233f38a321</word_id>
-						<id>618194ebfc8c6c42efcef3a4af0b8054f6af209b</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-				</columns>
-			</column_group>
-	</column_groups>
-	<test_data_list>
-	</test_data_list>
-	<sequence_set>
-	</sequence_set>
-	<trigger_set>
-	</trigger_set>
-	<change_tracking_list>
-	</change_tracking_list>
-</diagram>
diff --git a/web-fast/db/test.png b/web-fast/db/test.png
deleted file mode 100644
index da422a4a..00000000
Binary files a/web-fast/db/test.png and /dev/null differ
diff --git a/web-fast/pom.xml b/web-fast/pom.xml
index 6b5bc3d9..0be3aefb 100644
--- a/web-fast/pom.xml
+++ b/web-fast/pom.xml
@@ -23,7 +23,7 @@
 		
 		<finalName>web</finalName><!-- war or jar 鍖呯殑鍚嶇О -->
 		<start-class>com.jeesite.modules.FastApplication</start-class>
-		
+
 		<!-- docker setting -->
 		<docker.dockerHost>unix:///var/run/docker.sock</docker.dockerHost>
 		<docker.imageName>thinkgem/jeesite-web:latest</docker.imageName>
@@ -50,6 +50,13 @@
 			<artifactId>jeesite-module-core</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
+
+		<!-- 娴嬭瘯妯″潡 -->
+		<dependency>
+			<groupId>com.jeesite</groupId>
+			<artifactId>jeesite-module-test</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
 		
 		<!-- 鍦ㄧ嚎鏂囨。鎺ュ彛 -->
 		<dependency>
@@ -126,6 +133,7 @@
 					<wtpContextName>${finalName}</wtpContextName>
 				</configuration>
 			</plugin>
+			
 		</plugins>
 	</build>
 	
diff --git a/web-fast/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java b/web-fast/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java
deleted file mode 100644
index 7b96dda7..00000000
--- a/web-fast/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.dao;
-
-import com.jeesite.common.dao.CrudDao;
-import com.jeesite.common.mybatis.annotation.MyBatisDao;
-import com.jeesite.modules.test.entity.TestDataChild;
-
-/**
- * 娴嬭瘯鏁版嵁DAO鎺ュ彛
- * @author ThinkGem
- * @version 2018-04-22
- */
-@MyBatisDao//(dataSourceName="ds2")
-public interface TestDataChildDao extends CrudDao<TestDataChild> {
-	
-}
\ No newline at end of file
diff --git a/web-fast/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java b/web-fast/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java
deleted file mode 100644
index 5f73cfd0..00000000
--- a/web-fast/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.dao;
-
-import com.jeesite.common.dao.CrudDao;
-import com.jeesite.common.mybatis.annotation.MyBatisDao;
-import com.jeesite.modules.test.entity.TestData;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 娴嬭瘯鏁版嵁DAO鎺ュ彛
- * @author ThinkGem
- * @version 2018-04-22
- */
-@MyBatisDao
-public interface TestDataDao extends CrudDao<TestData> {
-	
-	/**
-	 * 婕旂ずMap鍙傛暟鍜岃繑鍥炲�硷紝鏀寔鍒嗛〉
-	 */
-	List<Map<String, Object>> findListForMap(Map<String, Object> params);
-	
-}
\ No newline at end of file
diff --git a/web-fast/src/main/java/com/jeesite/modules/test/dao/TestTreeDao.java b/web-fast/src/main/java/com/jeesite/modules/test/dao/TestTreeDao.java
deleted file mode 100644
index 7648d4cd..00000000
--- a/web-fast/src/main/java/com/jeesite/modules/test/dao/TestTreeDao.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.dao;
-
-import com.jeesite.common.dao.TreeDao;
-import com.jeesite.common.mybatis.annotation.MyBatisDao;
-import com.jeesite.modules.test.entity.TestTree;
-
-/**
- * 娴嬭瘯鏍戣〃DAO鎺ュ彛
- * @author ThinkGem
- * @version 2018-04-22
- */
-@MyBatisDao
-public interface TestTreeDao extends TreeDao<TestTree> {
-	
-}
\ No newline at end of file
diff --git a/web-fast/src/main/java/com/jeesite/modules/test/db/InitTestData.java b/web-fast/src/main/java/com/jeesite/modules/test/db/InitTestData.java
deleted file mode 100644
index 376844b7..00000000
--- a/web-fast/src/main/java/com/jeesite/modules/test/db/InitTestData.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.db;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Component;
-
-import com.jeesite.common.config.Global;
-import com.jeesite.common.lang.StringUtils;
-import com.jeesite.common.tests.BaseInitDataTests;
-import com.jeesite.modules.gen.entity.GenTable;
-import com.jeesite.modules.gen.entity.GenTableColumn;
-import com.jeesite.modules.gen.service.GenTableService;
-import com.jeesite.modules.gen.utils.GenUtils;
-
-/**
- * 鍒濆鍖栨牳蹇冭〃鏁版嵁
- * @author ThinkGem
- * @version 2020-5-26
- */
-@Component
-@ConditionalOnProperty(name="jeesite.initdata", havingValue="true", matchIfMissing=false)
-public class InitTestData extends BaseInitDataTests {
-
-	@Override
-	public boolean initData() throws Exception {
-		if (GenUtils.isTableExists("test_data")) {
-			return true; // 濡傛灉琛ㄥ凡瀛樺湪锛屽垯鏃犻渶鍒濆鍖�
-		}
-		runCreateScript("test.sql");
-		initGenDemoData();
-		return true;
-	}
-	
-	@Autowired
-	private GenTableService genTableService;
-	/**
-	 * 浠ｇ爜鐢熸垚娴嬭瘯鏁版嵁
-	 */
-	public void initGenDemoData() throws Exception{
-		if (!checkTable(GenTable.class)) {
-			return;
-		}
-		if (!checkTable(GenTableColumn.class)) {
-			return;
-		}
-		initGenTestData();
-		initGenTreeData();
-	}
-	/**
-	 * 浠ｇ爜鐢熸垚娴嬭瘯鏁版嵁
-	 */
-	private void initGenTestData() throws Exception{
-		GenTable genTable = new GenTable();
-		genTable.setIsNewRecord(true);
-		genTable.setTableName("test_data");
-		genTable = genTableService.getFromDb(genTable);
-		genTable.setIsNewRecord(true);
-		genTable.setClassName("TestData");
-		genTable.setFunctionAuthor("ThinkGem");
-		genTable.setTplCategory("crud");
-		genTable.setPackageName("com.jeesite.modules");
-		genTable.setModuleName("test");
-		genTable.setSubModuleName("");
-		genTable.setFunctionName("娴嬭瘯鏁版嵁");
-		genTable.setFunctionNameSimple("鏁版嵁");
-		genTable.getOptionMap().put("isHaveDisableEnable", Global.YES);
-		genTable.getOptionMap().put("isHaveDelete", Global.YES);
-		genTable.getOptionMap().put("isFileUpload", Global.YES);
-		genTable.getOptionMap().put("isImageUpload", Global.YES);
-		initGenTableColumn(genTable);
-		genTableService.save(genTable);
-		// 瀛愯〃
-		GenTable genTableChild = new GenTable();
-		genTableChild.setIsNewRecord(true);
-		genTableChild.setTableName("test_data_child");
-		genTableChild = genTableService.getFromDb(genTableChild);
-		genTableChild.setIsNewRecord(true);
-		genTableChild.setClassName("TestDataChild");
-		genTableChild.setFunctionAuthor("ThinkGem");
-		genTableChild.setTplCategory("crud");
-		genTableChild.setPackageName("com.jeesite.modules");
-		genTableChild.setModuleName("test");
-		genTableChild.setSubModuleName("");
-		genTableChild.setFunctionName("娴嬭瘯瀛愯〃");
-		genTableChild.setFunctionNameSimple("鏁版嵁");
-		genTableChild.setParentTableName("test_data");
-		genTableChild.setParentTableFkName("test_data_id");
-		initGenTableColumn(genTableChild);
-		genTableService.save(genTableChild);
-	}
-	
-	/**
-	 * 浠ｇ爜鐢熸垚娴嬭瘯鏁版嵁锛堝垪鍒濆鍖栵級
-	 */
-	private void initGenTableColumn(GenTable genTable){
-		for(GenTableColumn column : genTable.getColumnList()){
-			if ("test_input".equals(column.getColumnName())
-					|| "test_textarea".equals(column.getColumnName())
-					|| "test_select".equals(column.getColumnName())
-					|| "test_select_multiple".equals(column.getColumnName())
-					|| "test_checkbox".equals(column.getColumnName())
-					|| "test_radio".equals(column.getColumnName())
-					|| "test_date".equals(column.getColumnName())
-					|| "test_datetime".equals(column.getColumnName())
-				){
-				column.setShowType(StringUtils.substringAfter(
-						column.getColumnName(), "test_"));
-				if ("test_input".equals(column.getColumnName())
-						){
-					column.setQueryType("LIKE");
-				}
-				else if ("test_textarea".equals(column.getColumnName())
-						){
-					column.setQueryType("LIKE");
-					column.getOptionMap().put("isNewLine", Global.YES);
-//					column.getOptionMap().put("gridRowCol", "12/2/10");
-				}
-				else if ("test_select".equals(column.getColumnName())
-						|| "test_select_multiple".equals(column.getColumnName())
-						|| "test_radio".equals(column.getColumnName())
-						|| "test_checkbox".equals(column.getColumnName())
-						){
-					column.getOptionMap().put("dictType", "sys_menu_type");
-					column.getOptionMap().put("dictName", "sys_menu_type");
-				}
-				else if ("test_date".equals(column.getColumnName())
-						|| "test_datetime".equals(column.getColumnName())
-						){
-					column.setQueryType("BETWEEN");
-				}
-			}else if ("test_user_code".equals(column.getColumnName())){
-				column.setAttrType("com.jeesite.modules.sys.entity.User");
-				column.setFullAttrName("testUser");
-				column.setShowType("userselect");
-			}else if ("test_office_code".equals(column.getColumnName())){
-				column.setAttrType("com.jeesite.modules.sys.entity.Office");
-				column.setFullAttrName("testOffice");
-				column.setShowType("officeselect");
-			}else if ("test_area_code".equals(column.getColumnName())){
-				column.setFullAttrName("testAreaCode|testAreaName");
-				column.setShowType("areaselect");
-			}else if ("test_area_name".equals(column.getColumnName())){
-				column.setIsEdit(Global.NO);
-				column.setIsQuery(Global.NO);
-			}else if ("test_data_id".equals(column.getColumnName())){
-				column.setFullAttrName("testData");
-			}
-		}
-	}
-	
-	/**
-	 * 浠ｇ爜鐢熸垚鏍戣〃娴嬭瘯鏁版嵁
-	 */
-	private void initGenTreeData() throws Exception{
-		GenTable genTable = new GenTable();
-		genTable.setIsNewRecord(true);
-		genTable.setTableName("test_tree");
-		genTable = genTableService.getFromDb(genTable);
-		genTable.setIsNewRecord(true);
-		genTable.setClassName("TestTree");
-		genTable.setFunctionAuthor("ThinkGem");
-		genTable.setTplCategory("treeGrid");
-		genTable.setPackageName("com.jeesite.modules");
-		genTable.setModuleName("test");
-		genTable.setSubModuleName("");
-		genTable.setFunctionName("娴嬭瘯鏍戣〃");
-		genTable.setFunctionNameSimple("鏁版嵁");
-		genTable.getOptionMap().put("isHaveDisableEnable", Global.YES);
-		genTable.getOptionMap().put("isHaveDelete", Global.YES);
-		genTable.getOptionMap().put("isFileUpload", Global.YES);
-		genTable.getOptionMap().put("isImageUpload", Global.YES);
-		genTable.getOptionMap().put("treeViewCode", "tree_code");
-		genTable.getOptionMap().put("treeViewName", "tree_name");
-		initGenTableColumn(genTable);
-		genTableService.save(genTable);
-	}
-	
-}
diff --git a/web-fast/src/main/java/com/jeesite/modules/test/entity/TestData.java b/web-fast/src/main/java/com/jeesite/modules/test/entity/TestData.java
deleted file mode 100644
index dbd07330..00000000
--- a/web-fast/src/main/java/com/jeesite/modules/test/entity/TestData.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.entity;
-
-import javax.validation.constraints.Size;
-import java.util.Date;
-import com.jeesite.common.mybatis.annotation.JoinTable;
-import com.jeesite.common.mybatis.annotation.JoinTable.Type;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jeesite.modules.sys.entity.User;
-import com.jeesite.modules.sys.entity.Office;
-import java.util.List;
-import com.jeesite.common.collect.ListUtils;
-
-import com.jeesite.common.entity.DataEntity;
-import com.jeesite.common.mybatis.annotation.Column;
-import com.jeesite.common.mybatis.annotation.Table;
-import com.jeesite.common.mybatis.mapper.query.QueryType;
-
-/**
- * 娴嬭瘯鏁版嵁Entity
- * @author ThinkGem
- * @version 2018-04-22
- */
-@Table(name="test_data", alias="a", columns={
-		@Column(name="id", attrName="id", label="缂栧彿", isPK=true),
-		@Column(name="test_input", attrName="testInput", label="鍗曡鏂囨湰", queryType=QueryType.LIKE),
-		@Column(name="test_textarea", attrName="testTextarea", label="澶氳鏂囨湰", queryType=QueryType.LIKE),
-		@Column(name="test_select", attrName="testSelect", label="涓嬫媺妗�"),
-		@Column(name="test_select_multiple", attrName="testSelectMultiple", label="涓嬫媺澶氶��"),
-		@Column(name="test_radio", attrName="testRadio", label="鍗曢�夋"),
-		@Column(name="test_checkbox", attrName="testCheckbox", label="澶嶉�夋"),
-		@Column(name="test_date", attrName="testDate", label="鏃ユ湡閫夋嫨", isUpdateForce=true/*鏄惁寮哄埗鏇存柊锛堝綋璋冪敤update骞朵笖璇ュ睘鎬т负绌虹殑鏃跺�欙紝鍏佽鏇存柊涓虹┖锛�*/),
-		@Column(name="test_datetime", attrName="testDatetime", label="鏃ユ湡鏃堕棿", isUpdateForce=true),
-		@Column(name="test_user_code", attrName="testUser.userCode", label="鐢ㄦ埛閫夋嫨"),
-		@Column(name="test_office_code", attrName="testOffice.officeCode", label="鏈烘瀯閫夋嫨"),
-		@Column(name="test_area_code", attrName="testAreaCode", label="鍖哄煙閫夋嫨"),
-		@Column(name="test_area_name", attrName="testAreaName", label="鍖哄煙鍚嶇О"),
-		@Column(includeEntity=DataEntity.class),
-	}, joinTable={
-		@JoinTable(type=Type.LEFT_JOIN, entity=User.class, attrName="testUser", alias="u10",
-			on="u10.user_code = a.test_user_code", columns={
-				@Column(name="user_code", label="鐢ㄦ埛缂栫爜", isPK=true),
-				@Column(name="user_name", label="鐢ㄦ埛鍚嶇О", isQuery=false),
-		}),
-		@JoinTable(type=Type.LEFT_JOIN, entity=Office.class, attrName="testOffice", alias="u11",
-			on="u11.office_code = a.test_office_code", columns={
-				@Column(name="office_code", label="鏈烘瀯缂栫爜", isPK=true),
-				@Column(name="office_name", label="鏈烘瀯鍚嶇О", isQuery=false),
-		}),
-	}, orderBy="a.update_date DESC"
-)
-public class TestData extends DataEntity<TestData> {
-	
-	private static final long serialVersionUID = 1L;
-	private String testInput;		// 鍗曡鏂囨湰
-	private String testTextarea;		// 澶氳鏂囨湰
-	private String testSelect;		// 涓嬫媺妗�
-	private String testSelectMultiple;		// 涓嬫媺澶氶��
-	private String testRadio;		// 鍗曢�夋
-	private String testCheckbox;		// 澶嶉�夋
-	private Date testDate;		// 鏃ユ湡閫夋嫨
-	private Date testDatetime;		// 鏃ユ湡鏃堕棿
-	private User testUser;		// 鐢ㄦ埛閫夋嫨
-	private Office testOffice;		// 鏈烘瀯閫夋嫨
-	private String testAreaCode;		// 鍖哄煙閫夋嫨
-	private String testAreaName;		// 鍖哄煙鍚嶇О
-	private List<TestDataChild> testDataChildList = ListUtils.newArrayList();		// 瀛愯〃鍒楄〃
-	
-	public TestData() {
-		this(null);
-	}
-
-	public TestData(String id){
-		super(id);
-	}
-	
-	@Size(min=0, max=200, message="鍗曡鏂囨湰闀垮害涓嶈兘瓒呰繃 200 涓瓧绗�")
-	public String getTestInput() {
-		return testInput;
-	}
-
-	public void setTestInput(String testInput) {
-		this.testInput = testInput;
-	}
-	
-	@Size(min=0, max=200, message="澶氳鏂囨湰闀垮害涓嶈兘瓒呰繃 200 涓瓧绗�")
-	public String getTestTextarea() {
-		return testTextarea;
-	}
-
-	public void setTestTextarea(String testTextarea) {
-		this.testTextarea = testTextarea;
-	}
-	
-	@Size(min=0, max=10, message="涓嬫媺妗嗛暱搴︿笉鑳借秴杩� 10 涓瓧绗�")
-	public String getTestSelect() {
-		return testSelect;
-	}
-
-	public void setTestSelect(String testSelect) {
-		this.testSelect = testSelect;
-	}
-	
-	@Size(min=0, max=200, message="涓嬫媺澶氶�夐暱搴︿笉鑳借秴杩� 200 涓瓧绗�")
-	public String getTestSelectMultiple() {
-		return testSelectMultiple;
-	}
-
-	public void setTestSelectMultiple(String testSelectMultiple) {
-		this.testSelectMultiple = testSelectMultiple;
-	}
-	
-	@Size(min=0, max=10, message="鍗曢�夋闀垮害涓嶈兘瓒呰繃 10 涓瓧绗�")
-	public String getTestRadio() {
-		return testRadio;
-	}
-
-	public void setTestRadio(String testRadio) {
-		this.testRadio = testRadio;
-	}
-	
-	@Size(min=0, max=200, message="澶嶉�夋闀垮害涓嶈兘瓒呰繃 200 涓瓧绗�")
-	public String getTestCheckbox() {
-		return testCheckbox;
-	}
-
-	public void setTestCheckbox(String testCheckbox) {
-		this.testCheckbox = testCheckbox;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	public Date getTestDate() {
-		return testDate;
-	}
-
-	public void setTestDate(Date testDate) {
-		this.testDate = testDate;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-	public Date getTestDatetime() {
-		return testDatetime;
-	}
-
-	public void setTestDatetime(Date testDatetime) {
-		this.testDatetime = testDatetime;
-	}
-	
-	public User getTestUser() {
-		return testUser;
-	}
-
-	public void setTestUser(User testUser) {
-		this.testUser = testUser;
-	}
-	
-	public Office getTestOffice() {
-		return testOffice;
-	}
-
-	public void setTestOffice(Office testOffice) {
-		this.testOffice = testOffice;
-	}
-	
-	@Size(min=0, max=64, message="鍖哄煙閫夋嫨闀垮害涓嶈兘瓒呰繃 64 涓瓧绗�")
-	public String getTestAreaCode() {
-		return testAreaCode;
-	}
-
-	public void setTestAreaCode(String testAreaCode) {
-		this.testAreaCode = testAreaCode;
-	}
-	
-	@Size(min=0, max=100, message="鍖哄煙鍚嶇О闀垮害涓嶈兘瓒呰繃 100 涓瓧绗�")
-	public String getTestAreaName() {
-		return testAreaName;
-	}
-
-	public void setTestAreaName(String testAreaName) {
-		this.testAreaName = testAreaName;
-	}
-	
-	public Date getTestDate_gte() {
-		return sqlMap.getWhere().getValue("test_date", QueryType.GTE);
-	}
-
-	public void setTestDate_gte(Date testDate) {
-		sqlMap.getWhere().and("test_date", QueryType.GTE, testDate);
-	}
-	
-	public Date getTestDate_lte() {
-		return sqlMap.getWhere().getValue("test_date", QueryType.LTE);
-	}
-
-	public void setTestDate_lte(Date testDate) {
-		sqlMap.getWhere().and("test_date", QueryType.LTE, testDate);
-	}
-	
-	public Date getTestDatetime_gte() {
-		return sqlMap.getWhere().getValue("test_datetime", QueryType.GTE);
-	}
-
-	public void setTestDatetime_gte(Date testDatetime) {
-		sqlMap.getWhere().and("test_datetime", QueryType.GTE, testDatetime);
-	}
-	
-	public Date getTestDatetime_lte() {
-		return sqlMap.getWhere().getValue("test_datetime", QueryType.LTE);
-	}
-
-	public void setTestDatetime_lte(Date testDatetime) {
-		sqlMap.getWhere().and("test_datetime", QueryType.LTE, testDatetime);
-	}
-	
-	public List<TestDataChild> getTestDataChildList() {
-		return testDataChildList;
-	}
-
-	public void setTestDataChildList(List<TestDataChild> testDataChildList) {
-		this.testDataChildList = testDataChildList;
-	}
-	
-}
\ No newline at end of file
diff --git a/web-fast/src/main/java/com/jeesite/modules/test/entity/TestTree.java b/web-fast/src/main/java/com/jeesite/modules/test/entity/TestTree.java
deleted file mode 100644
index 4486ba5f..00000000
--- a/web-fast/src/main/java/com/jeesite/modules/test/entity/TestTree.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.entity;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-import com.jeesite.common.entity.DataEntity;
-import com.jeesite.common.entity.TreeEntity;
-import com.jeesite.common.mybatis.annotation.Column;
-import com.jeesite.common.mybatis.annotation.Table;
-import com.jeesite.common.mybatis.mapper.query.QueryType;
-
-/**
- * 娴嬭瘯鏍戣〃Entity
- * @author ThinkGem
- * @version 2018-04-22
- */
-@Table(name="test_tree", alias="a", columns={
-		@Column(name="tree_code", attrName="treeCode", label="鑺傜偣缂栫爜", isPK=true),
-		@Column(includeEntity=TreeEntity.class),
-		@Column(name="tree_name", attrName="treeName", label="鑺傜偣鍚嶇О", queryType=QueryType.LIKE, isTreeName=true),
-		@Column(includeEntity=DataEntity.class),
-	}, orderBy="a.tree_sorts, a.tree_code"
-)
-public class TestTree extends TreeEntity<TestTree> {
-	
-	private static final long serialVersionUID = 1L;
-	private String treeCode;		// 鑺傜偣缂栫爜
-	private String treeName;		// 鑺傜偣鍚嶇О
-	
-	public TestTree() {
-		this(null);
-	}
-
-	public TestTree(String id){
-		super(id);
-	}
-	
-	@Override
-	public TestTree getParent() {
-		return parent;
-	}
-
-	@Override
-	public void setParent(TestTree parent) {
-		this.parent = parent;
-	}
-	
-	public String getTreeCode() {
-		return treeCode;
-	}
-
-	public void setTreeCode(String treeCode) {
-		this.treeCode = treeCode;
-	}
-	
-	@NotBlank(message="鑺傜偣鍚嶇О涓嶈兘涓虹┖")
-	@Size(min=0, max=200, message="鑺傜偣鍚嶇О闀垮害涓嶈兘瓒呰繃 200 涓瓧绗�")
-	public String getTreeName() {
-		return treeName;
-	}
-
-	public void setTreeName(String treeName) {
-		this.treeName = treeName;
-	}
-	
-}
\ No newline at end of file
diff --git a/web-fast/src/main/java/com/jeesite/modules/test/service/TestDataService.java b/web-fast/src/main/java/com/jeesite/modules/test/service/TestDataService.java
deleted file mode 100644
index 27a409d1..00000000
--- a/web-fast/src/main/java/com/jeesite/modules/test/service/TestDataService.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.service;
-
-import com.jeesite.common.entity.Page;
-import com.jeesite.common.idgen.IdGen;
-import com.jeesite.common.lang.DateUtils;
-import com.jeesite.common.service.CrudService;
-import com.jeesite.modules.file.utils.FileUploadUtils;
-import com.jeesite.modules.sys.service.UserService;
-import com.jeesite.modules.test.dao.TestDataChildDao;
-import com.jeesite.modules.test.dao.TestDataDao;
-import com.jeesite.modules.test.entity.TestData;
-import com.jeesite.modules.test.entity.TestDataChild;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 娴嬭瘯鏁版嵁Service
- * @author ThinkGem
- * @version 2018-04-22
- */
-@Service
-public class TestDataService extends CrudService<TestDataDao, TestData> {
-	
-	@Autowired
-	private TestDataChildDao testDataChildDao;
-	
-	/**
-	 * 鑾峰彇鍗曟潯鏁版嵁
-	 * @param testData
-	 * @return
-	 */
-	@Override
-	public TestData get(TestData testData) {
-		TestData entity = super.get(testData);
-		if (entity != null){
-			TestDataChild testDataChild = new TestDataChild(entity);
-			testDataChild.setStatus(TestDataChild.STATUS_NORMAL);
-			entity.setTestDataChildList(testDataChildDao.findList(testDataChild));
-		}
-		return entity;
-	}
-	
-	/**
-	 * 鏌ヨ鍒嗛〉鏁版嵁
-	 * @param testData 鏌ヨ鏉′欢
-	 * @param testData page 鍒嗛〉瀵硅薄
-	 * @return
-	 */
-	@Override
-	public Page<TestData> findPage(TestData testData) {
-		
-//		// 婕旂ずMap鍙傛暟鍜岃繑鍥炲�硷紝鏀寔鍒嗛〉
-//		Page<Map<String, Object>> pageMap = new Page<>();
-//		Map<String, Object> params = MapUtils.newHashMap();
-//		params.put("testInput", "123");
-//		params.put("page", pageMap);
-//		pageMap.setList(dao.findListForMap(params));
-//		System.out.println(pageMap.getList());
-//		System.out.println(pageMap.getCount());
-		
-		return super.findPage(testData);
-	}
-	
-	/**
-	 * 鏌ヨ瀛愯〃鍒嗛〉鏁版嵁
-	 * @param page 鍒嗛〉瀵硅薄
-	 * @param testData
-	 * @return
-	 */
-	public List<TestDataChild> findSubList(TestDataChild testData) {
-		return testDataChildDao.findList(testData);
-	}
-	
-	/**
-	 * 淇濆瓨鏁版嵁锛堟彃鍏ユ垨鏇存柊锛�
-	 * @param testData
-	 */
-	@Override
-	@Transactional
-	public void save(TestData testData) {
-		super.save(testData);
-		// 淇濆瓨涓婁紶鍥剧墖
-		FileUploadUtils.saveFileUpload(testData, testData.getId(), "testData_image");
-		// 淇濆瓨涓婁紶闄勪欢
-		FileUploadUtils.saveFileUpload(testData, testData.getId(), "testData_file");
-		// 淇濆瓨 TestData瀛愯〃
-		int index = 0;
-		for (TestDataChild testDataChild : testData.getTestDataChildList()){
-			if (!TestDataChild.STATUS_DELETE.equals(testDataChild.getStatus())){
-				testDataChild.setTestData(testData);
-				if (testDataChild.getIsNewRecord()){
-					testDataChild.preInsert();
-					testDataChildDao.insert(testDataChild);
-				}else{
-					testDataChild.preUpdate();
-					testDataChildDao.update(testDataChild);
-				}
-			}else{
-				testDataChildDao.delete(testDataChild);
-			}
-			// 淇濆瓨涓婁紶闄勪欢
-			FileUploadUtils.saveFileUpload(testDataChild, testDataChild.getId(),
-					"testDataChildList["+index+"].testDataChild_file");
-			index++;
-		}
-	}
-	
-	/**
-	 * 鏇存柊鐘舵��
-	 * @param testData
-	 */
-	@Override
-	@Transactional
-	public void updateStatus(TestData testData) {
-		super.updateStatus(testData);
-	}
-	
-	/**
-	 * 鍒犻櫎鏁版嵁
-	 * @param testData
-	 */
-	@Override
-	@Transactional
-	public void delete(TestData testData) {
-		super.delete(testData);
-		TestDataChild testDataChild = new TestDataChild();
-		testDataChild.setTestData(testData);
-		testDataChildDao.deleteByEntity(testDataChild);
-	}
-	
-	/**
-	 * 浠诲姟璋冨害娴嬭瘯锛歵estDataService.executeTestTask(userService, 1, 2L, 3F, 4D, 'abc')
-	 */
-	public void executeTestTask(UserService userService, Integer i, Long l, Float f, Double d, String s){
-		System.out.println(DateUtils.getTime() + " 浠诲姟鎵ц浜唦~~  bean: " + userService + ", i: " + i
-				+ ", l: " + l + ", f: " + f + ", d: " + d + ", s: " + s);
-	}
-	
-	/**
-	 * 浜嬪姟娴嬭瘯锛岃嫢 Child 鎶ラ敊锛屽垯鍥炴粴
-	 */
-	@Transactional//(propagation = Propagation.NOT_SUPPORTED)
-	public void transTest(TestData testData) {
-		testData.setTestInput("transTest");
-		testData.setTestTextarea(IdGen.randomBase62(5));
-		dao.insert(testData);
-		TestDataChild testDataChild = new TestDataChild();
-		testDataChild.setTestData(testData);
-		// 璁剧疆涓�涓秴鍑烘暟鎹簱鑼冨洿鐨勫�硷紝鎶涘嚭鏁版嵁搴撳紓甯�
-		StringBuilder sb = new StringBuilder();
-		for (int i=0; i<500; i++){
-			sb.append("transTest" + i);
-		}
-		testDataChild.setTestInput(sb.toString());
-		testDataChildDao.insert(testDataChild);
-	}
-	
-	/**
-	 * 浜嬪姟楠岃瘉锛岃繑鍥炵┖锛屽垯浜嬪姟鍥炴粴鎴愬姛
-	 */
-	public boolean transValid(TestData testData) {
-		return dao.get(testData) == null;
-	}
-	
-}
\ No newline at end of file
diff --git a/web-fast/src/main/java/com/jeesite/modules/test/service/TestTreeService.java b/web-fast/src/main/java/com/jeesite/modules/test/service/TestTreeService.java
deleted file mode 100644
index ced00001..00000000
--- a/web-fast/src/main/java/com/jeesite/modules/test/service/TestTreeService.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.service;
-
-import com.jeesite.common.service.TreeService;
-import com.jeesite.modules.file.utils.FileUploadUtils;
-import com.jeesite.modules.test.dao.TestTreeDao;
-import com.jeesite.modules.test.entity.TestTree;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 娴嬭瘯鏍戣〃Service
- * @author ThinkGem
- * @version 2018-04-22
- */
-@Service
-public class TestTreeService extends TreeService<TestTreeDao, TestTree> {
-	
-	/**
-	 * 鑾峰彇鍗曟潯鏁版嵁
-	 * @param testTree
-	 * @return
-	 */
-	@Override
-	public TestTree get(TestTree testTree) {
-		return super.get(testTree);
-	}
-	
-	/**
-	 * 鏌ヨ鍒楄〃鏁版嵁
-	 * @param testTree
-	 * @return
-	 */
-	@Override
-	public List<TestTree> findList(TestTree testTree) {
-		return super.findList(testTree);
-	}
-	
-	/**
-	 * 淇濆瓨鏁版嵁锛堟彃鍏ユ垨鏇存柊锛�
-	 * @param testTree
-	 */
-	@Override
-	@Transactional
-	public void save(TestTree testTree) {
-		super.save(testTree);
-		// 淇濆瓨涓婁紶鍥剧墖
-		FileUploadUtils.saveFileUpload(testTree, testTree.getId(), "testTree_image");
-		// 淇濆瓨涓婁紶闄勪欢
-		FileUploadUtils.saveFileUpload(testTree, testTree.getId(), "testTree_file");
-	}
-	
-	/**
-	 * 鏇存柊鐘舵��
-	 * @param testTree
-	 */
-	@Override
-	@Transactional
-	public void updateStatus(TestTree testTree) {
-		super.updateStatus(testTree);
-	}
-	
-	/**
-	 * 鍒犻櫎鏁版嵁
-	 * @param testTree
-	 */
-	@Override
-	@Transactional
-	public void delete(TestTree testTree) {
-		testTree.sqlMap().markIdDelete(); // 閫昏緫鍒犻櫎鏃舵爣璁癐D鍊�
-		super.delete(testTree);
-	}
-	
-}
\ No newline at end of file
diff --git a/web-fast/src/main/java/com/jeesite/modules/test/web/DemoController.java b/web-fast/src/main/java/com/jeesite/modules/test/web/DemoController.java
deleted file mode 100644
index 63be2d92..00000000
--- a/web-fast/src/main/java/com/jeesite/modules/test/web/DemoController.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.web;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.jeesite.common.lang.StringUtils;
-import com.jeesite.common.web.BaseController;
-import com.jeesite.modules.test.entity.TestData;
-import com.jeesite.modules.test.service.TestDataService;
-
-/**
- * 婕旂ず瀹炰緥Controller
- * @author ThinkGem
- * @version 2018-03-24
- */
-@Controller
-@RequestMapping(value = "${adminPath}/demo")
-public class DemoController extends BaseController {
-
-	@Autowired
-	private TestDataService testDataService;
-	
-	/**
-	 * 鑾峰彇鏁版嵁
-	 */
-	@ModelAttribute
-	public TestData get(String id, boolean isNewRecord) {
-		return testDataService.get(id, isNewRecord);
-	}
-	
-	/**
-	 * DataGrid
-	 */
-	@RequiresPermissions("test:testData:view")
-	@RequestMapping(value = "dataGrid/{viewName}")
-	public String dataGrid(@PathVariable String viewName, TestData testData, Model model) {
-		return "modules/demo/demoDataGrid" + StringUtils.cap(viewName);
-	}
-	
-	/**
-	 * Form
-	 */
-	@RequiresPermissions("test:testData:view")
-	@RequestMapping(value = "form/{viewName}")
-	public String form(@PathVariable String viewName, TestData testData, Model model) {
-		return "modules/demo/demoForm" + StringUtils.cap(viewName);
-	}
-	
-}
\ No newline at end of file
diff --git a/web-fast/src/main/java/com/jeesite/modules/test/web/TestDataController.java b/web-fast/src/main/java/com/jeesite/modules/test/web/TestDataController.java
deleted file mode 100644
index 3eb3fb8d..00000000
--- a/web-fast/src/main/java/com/jeesite/modules/test/web/TestDataController.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.web;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.jeesite.common.config.Global;
-import com.jeesite.common.entity.Page;
-import com.jeesite.common.web.BaseController;
-import com.jeesite.modules.test.entity.TestData;
-import com.jeesite.modules.test.entity.TestDataChild;
-import com.jeesite.modules.test.service.TestDataService;
-
-/**
- * 娴嬭瘯鏁版嵁Controller
- * @author ThinkGem
- * @version 2018-04-22
- */
-@Controller
-@RequestMapping(value = "${adminPath}/test/testData")
-public class TestDataController extends BaseController {
-
-	@Autowired
-	private TestDataService testDataService;
-	
-	/**
-	 * 鑾峰彇鏁版嵁
-	 */
-	@ModelAttribute
-	public TestData get(String id, boolean isNewRecord) {
-		return testDataService.get(id, isNewRecord);
-	}
-	
-	/**
-	 * 鏌ヨ鍒楄〃
-	 */
-	@RequiresPermissions("test:testData:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(TestData testData, Model model) {
-		model.addAttribute("testData", testData);
-		return "modules/test/testDataList";
-	}
-	
-	/**
-	 * 鏌ヨ鍒楄〃鏁版嵁
-	 */
-	@RequiresPermissions("test:testData:view")
-	@RequestMapping(value = "listData")
-	@ResponseBody
-	public Page<TestData> listData(TestData testData, HttpServletRequest request, HttpServletResponse response) {
-		testData.setPage(new Page<>(request, response));
-		Page<TestData> page = testDataService.findPage(testData);
-		return page;
-	}
-	
-	/**
-	 * 鏌ヨ瀛愯〃鍒楄〃鏁版嵁
-	 */
-	@RequiresPermissions("test:testData:view")
-	@RequestMapping(value = "subListData")
-	@ResponseBody
-	public List<TestDataChild> subListData(TestDataChild testDataChild) {
-		return testDataService.findSubList(testDataChild);
-	}
-
-	/**
-	 * 鏌ョ湅缂栬緫琛ㄥ崟
-	 */
-	@RequiresPermissions("test:testData:view")
-	@RequestMapping(value = "form")
-	public String form(TestData testData, Model model) {
-		model.addAttribute("testData", testData);
-		return "modules/test/testDataForm";
-	}
-
-	/**
-	 * 淇濆瓨鏁版嵁
-	 */
-	@RequiresPermissions("test:testData:edit")
-	@PostMapping(value = "save")
-	@ResponseBody
-	public String save(@Validated TestData testData) {
-		testDataService.save(testData);
-		return renderResult(Global.TRUE, text("淇濆瓨鏁版嵁鎴愬姛锛�"));
-	}
-	
-	/**
-	 * 鍋滅敤鏁版嵁
-	 */
-	@RequiresPermissions("test:testData:edit")
-	@RequestMapping(value = "disable")
-	@ResponseBody
-	public String disable(TestData testData) {
-		testData.setStatus(TestData.STATUS_DISABLE);
-		testDataService.updateStatus(testData);
-		return renderResult(Global.TRUE, text("鍋滅敤鏁版嵁鎴愬姛"));
-	}
-	
-	/**
-	 * 鍚敤鏁版嵁
-	 */
-	@RequiresPermissions("test:testData:edit")
-	@RequestMapping(value = "enable")
-	@ResponseBody
-	public String enable(TestData testData) {
-		testData.setStatus(TestData.STATUS_NORMAL);
-		testDataService.updateStatus(testData);
-		return renderResult(Global.TRUE, text("鍚敤鏁版嵁鎴愬姛"));
-	}
-	
-	/**
-	 * 鍒犻櫎鏁版嵁
-	 */
-	@RequiresPermissions("test:testData:edit")
-	@RequestMapping(value = "delete")
-	@ResponseBody
-	public String delete(TestData testData) {
-		testDataService.delete(testData);
-		return renderResult(Global.TRUE, text("鍒犻櫎鏁版嵁鎴愬姛锛�"));
-	}
-	
-	/**
-	 * 浜嬪姟娴嬭瘯
-	 */
-	@RequiresPermissions("test:testData:edit")
-	@RequestMapping(value = "transTest")
-	@ResponseBody
-	public String transTest(TestData testData) {
-		try{
-			testDataService.transTest(testData);
-		}catch (Exception e) {
-			logger.debug("浜嬪姟娴嬭瘯淇℃伅锛屾姤閿欏洖婊氾細" + e.getMessage());
-		}
-		boolean bl = testDataService.transValid(testData);
-		return renderResult(Global.TRUE, "浜嬪姟娴嬭瘯"+(bl?"鎴愬姛锛屾暟鎹凡":"澶辫触锛屾暟鎹湭")+"鍥炴粴锛�");
-	}
-	
-}
\ No newline at end of file
diff --git a/web-fast/src/main/java/com/jeesite/modules/test/web/TestTreeController.java b/web-fast/src/main/java/com/jeesite/modules/test/web/TestTreeController.java
deleted file mode 100644
index a93002eb..00000000
--- a/web-fast/src/main/java/com/jeesite/modules/test/web/TestTreeController.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.web;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.jeesite.common.config.Global;
-import com.jeesite.common.collect.ListUtils;
-import com.jeesite.common.collect.MapUtils;
-import com.jeesite.common.lang.StringUtils;
-import com.jeesite.common.idgen.IdGen;
-import com.jeesite.modules.sys.utils.UserUtils;
-import com.jeesite.common.web.BaseController;
-import com.jeesite.modules.test.entity.TestTree;
-import com.jeesite.modules.test.service.TestTreeService;
-
-/**
- * 娴嬭瘯鏍戣〃Controller
- * @author ThinkGem
- * @version 2018-04-22
- */
-@Controller
-@RequestMapping(value = "${adminPath}/test/testTree")
-public class TestTreeController extends BaseController {
-
-	@Autowired
-	private TestTreeService testTreeService;
-	
-	/**
-	 * 鑾峰彇鏁版嵁
-	 */
-	@ModelAttribute
-	public TestTree get(String treeCode, boolean isNewRecord) {
-		return testTreeService.get(treeCode, isNewRecord);
-	}
-	
-	/**
-	 * 鏌ヨ鍒楄〃
-	 */
-	@RequiresPermissions("test:testTree:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(TestTree testTree, Model model) {
-		model.addAttribute("testTree", testTree);
-		return "modules/test/testTreeList";
-	}
-	
-	/**
-	 * 鏌ヨ鍒楄〃鏁版嵁
-	 */
-	@RequiresPermissions("test:testTree:view")
-	@RequestMapping(value = "listData")
-	@ResponseBody
-	public List<TestTree> listData(TestTree testTree) {
-		if (StringUtils.isBlank(testTree.getParentCode())) {
-			testTree.setParentCode(TestTree.ROOT_CODE);
-		}
-		if (StringUtils.isNotBlank(testTree.getTreeName())){
-			testTree.setParentCode(null);
-		}
-		if (StringUtils.isNotBlank(testTree.getRemarks())){
-			testTree.setParentCode(null);
-		}
-		List<TestTree> list = testTreeService.findList(testTree);
-		return list;
-	}
-
-	/**
-	 * 鏌ョ湅缂栬緫琛ㄥ崟
-	 */
-	@RequiresPermissions("test:testTree:view")
-	@RequestMapping(value = "form")
-	public String form(TestTree testTree, Model model) {
-		// 鍒涘缓骞跺垵濮嬪寲涓嬩竴涓妭鐐逛俊鎭�
-		testTree = createNextNode(testTree);
-		model.addAttribute("testTree", testTree);
-		return "modules/test/testTreeForm";
-	}
-	
-	/**
-	 * 鍒涘缓骞跺垵濮嬪寲涓嬩竴涓妭鐐逛俊鎭紝濡傦細鎺掑簭鍙枫�侀粯璁ゅ��
-	 */
-	@RequiresPermissions("test:testTree:edit")
-	@RequestMapping(value = "createNextNode")
-	@ResponseBody
-	public TestTree createNextNode(TestTree testTree) {
-		if (StringUtils.isNotBlank(testTree.getParentCode())){
-			testTree.setParent(testTreeService.get(testTree.getParentCode()));
-		}
-		if (testTree.getIsNewRecord()) {
-			TestTree where = new TestTree();
-			where.setParentCode(testTree.getParentCode());
-			TestTree last = testTreeService.getLastByParentCode(where);
-			// 鑾峰彇鍒颁笅绾ф渶鍚庝竴涓妭鐐�
-			if (last != null){
-				testTree.setTreeSort(last.getTreeSort() + 30);
-				testTree.setTreeCode(IdGen.nextCode(last.getTreeCode()));
-			}else if (testTree.getParent() != null){
-				testTree.setTreeCode(testTree.getParent().getTreeCode() + "001");
-			}
-		}
-		// 浠ヤ笅璁剧疆琛ㄥ崟榛樿鏁版嵁
-		if (testTree.getTreeSort() == null){
-			testTree.setTreeSort(TestTree.DEFAULT_TREE_SORT);
-		}
-		return testTree;
-	}
-
-	/**
-	 * 淇濆瓨鏁版嵁
-	 */
-	@RequiresPermissions("test:testTree:edit")
-	@PostMapping(value = "save")
-	@ResponseBody
-	public String save(@Validated TestTree testTree) {
-		testTreeService.save(testTree);
-		return renderResult(Global.TRUE, text("淇濆瓨鏁版嵁鎴愬姛锛�"));
-	}
-	
-	/**
-	 * 鍋滅敤鏁版嵁
-	 */
-	@RequiresPermissions("test:testTree:edit")
-	@RequestMapping(value = "disable")
-	@ResponseBody
-	public String disable(TestTree testTree) {
-		TestTree where = new TestTree();
-		where.setStatus(TestTree.STATUS_NORMAL);
-		where.setParentCodes("," + testTree.getId() + ",");
-		long count = testTreeService.findCount(where);
-		if (count > 0) {
-			return renderResult(Global.FALSE, text("璇ユ暟鎹寘鍚湭鍋滅敤鐨勫瓙鏁版嵁锛�"));
-		}
-		testTree.setStatus(TestTree.STATUS_DISABLE);
-		testTreeService.updateStatus(testTree);
-		return renderResult(Global.TRUE, text("鍋滅敤鏁版嵁鎴愬姛"));
-	}
-	
-	/**
-	 * 鍚敤鏁版嵁
-	 */
-	@RequiresPermissions("test:testTree:edit")
-	@RequestMapping(value = "enable")
-	@ResponseBody
-	public String enable(TestTree testTree) {
-		testTree.setStatus(TestTree.STATUS_NORMAL);
-		testTreeService.updateStatus(testTree);
-		return renderResult(Global.TRUE, text("鍚敤鏁版嵁鎴愬姛"));
-	}
-	
-	/**
-	 * 鍒犻櫎鏁版嵁
-	 */
-	@RequiresPermissions("test:testTree:edit")
-	@RequestMapping(value = "delete")
-	@ResponseBody
-	public String delete(TestTree testTree) {
-		testTreeService.delete(testTree);
-		return renderResult(Global.TRUE, text("鍒犻櫎鏁版嵁鎴愬姛锛�"));
-	}
-	
-	/**
-	 * 鑾峰彇鏍戠粨鏋勬暟鎹�
-	 * @param excludeCode 鎺掗櫎鐨凜ode
-	 * @param isShowCode 鏄惁鏄剧ず缂栫爜锛坱rue or 1锛氭樉绀哄湪宸︿晶锛�2锛氭樉绀哄湪鍙充晶锛沠alse or null锛氫笉鏄剧ず锛�
-	 * @return
-	 */
-	@RequiresPermissions("test:testTree:view")
-	@RequestMapping(value = "treeData")
-	@ResponseBody
-	public List<Map<String, Object>> treeData(String excludeCode, String isShowCode) {
-		List<Map<String, Object>> mapList = ListUtils.newArrayList();
-		List<TestTree> list = testTreeService.findList(new TestTree());
-		for (int i=0; i<list.size(); i++){
-			TestTree e = list.get(i);
-			// 杩囨护闈炴甯哥殑鏁版嵁
-			if (!TestTree.STATUS_NORMAL.equals(e.getStatus())){
-				continue;
-			}
-			// 杩囨护琚帓闄ょ殑缂栫爜锛堝寘鎷墍鏈夊瓙绾э級
-			if (StringUtils.isNotBlank(excludeCode)){
-				if (e.getId().equals(excludeCode)){
-					continue;
-				}
-				if (e.getParentCodes().contains("," + excludeCode + ",")){
-					continue;
-				}
-			}
-			Map<String, Object> map = MapUtils.newHashMap();
-			map.put("id", e.getId());
-			map.put("pId", e.getParentCode());
-			map.put("name", StringUtils.getTreeNodeName(isShowCode, e.getTreeCode(), e.getTreeName()));
-			mapList.add(map);
-		}
-		return mapList;
-	}
-
-	/**
-	 * 淇琛ㄧ粨鏋勭浉鍏虫暟鎹�
-	 */
-	@RequiresPermissions("test:testTree:edit")
-	@RequestMapping(value = "fixTreeData")
-	@ResponseBody
-	public String fixTreeData(TestTree testTree){
-		if (!UserUtils.getUser().isAdmin()){
-			return renderResult(Global.FALSE, "鎿嶄綔澶辫触锛屽彧鏈夌鐞嗗憳鎵嶈兘杩涜淇锛�");
-		}
-		testTreeService.fixTreeData();
-		return renderResult(Global.TRUE, "鏁版嵁淇鎴愬姛");
-	}
-	
-}
\ No newline at end of file
diff --git a/web-fast/src/main/resources/db/create/h2/test.sql b/web-fast/src/main/resources/db/create/h2/test.sql
deleted file mode 100644
index 11cf00cd..00000000
--- a/web-fast/src/main/resources/db/create/h2/test.sql
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL,
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date datetime,
-	test_datetime datetime,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date datetime NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date datetime NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL,
-	test_sort int,
-	test_data_id varchar(64),
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date datetime,
-	test_datetime datetime,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	tree_name varchar(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date datetime NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date datetime NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (tree_code)
-);
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '娴嬭瘯鏁版嵁';
-COMMENT ON COLUMN test_data.id IS '缂栧彿';
-COMMENT ON COLUMN test_data.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON COLUMN test_data.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_data.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_data.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_data.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_data.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_data.remarks IS '澶囨敞淇℃伅';
-COMMENT ON TABLE test_data_child IS '娴嬭瘯鏁版嵁瀛愯〃';
-COMMENT ON COLUMN test_data_child.id IS '缂栧彿';
-COMMENT ON COLUMN test_data_child.test_sort IS '鎺掑簭鍙�';
-COMMENT ON COLUMN test_data_child.test_data_id IS '鐖惰〃涓婚敭';
-COMMENT ON COLUMN test_data_child.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data_child.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data_child.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data_child.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON TABLE test_tree IS '娴嬭瘯鏍戣〃';
-COMMENT ON COLUMN test_tree.tree_code IS '鑺傜偣缂栫爜';
-COMMENT ON COLUMN test_tree.parent_code IS '鐖剁骇缂栧彿';
-COMMENT ON COLUMN test_tree.parent_codes IS '鎵�鏈夌埗绾х紪鍙�';
-COMMENT ON COLUMN test_tree.tree_sort IS '鎺掑簭鍙凤紙鍗囧簭锛�';
-COMMENT ON COLUMN test_tree.tree_sorts IS '鎵�鏈夋帓搴忓彿';
-COMMENT ON COLUMN test_tree.tree_leaf IS '鏄惁鏈�鏈骇';
-COMMENT ON COLUMN test_tree.tree_level IS '灞傛绾у埆';
-COMMENT ON COLUMN test_tree.tree_names IS '鍏ㄨ妭鐐瑰悕';
-COMMENT ON COLUMN test_tree.tree_name IS '鑺傜偣鍚嶇О';
-COMMENT ON COLUMN test_tree.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_tree.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_tree.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_tree.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_tree.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_tree.remarks IS '澶囨敞淇℃伅';
-
-
-
diff --git a/web-fast/src/main/resources/db/create/mssql/test.sql b/web-fast/src/main/resources/db/create/mssql/test.sql
deleted file mode 100644
index 4ae8a769..00000000
--- a/web-fast/src/main/resources/db/create/mssql/test.sql
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE [test_data]
-(
-	[id] varchar(64) NOT NULL,
-	[test_input] varchar(200),
-	[test_textarea] nvarchar(200),
-	[test_select] varchar(10),
-	[test_select_multiple] varchar(200),
-	[test_radio] varchar(10),
-	[test_checkbox] varchar(200),
-	[test_date] datetime,
-	[test_datetime] datetime,
-	[test_user_code] varchar(64),
-	[test_office_code] varchar(64),
-	[test_area_code] varchar(64),
-	[test_area_name] nvarchar(100),
-	[status] char(1) DEFAULT '0' NOT NULL,
-	[create_by] varchar(64) NOT NULL,
-	[create_date] datetime NOT NULL,
-	[update_by] varchar(64) NOT NULL,
-	[update_date] datetime NOT NULL,
-	[remarks] nvarchar(500),
-	PRIMARY KEY ([id])
-);
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE [test_data_child]
-(
-	[id] varchar(64) NOT NULL,
-	[test_sort] int,
-	[test_data_id] varchar(64),
-	[test_input] varchar(200),
-	[test_textarea] nvarchar(200),
-	[test_select] varchar(10),
-	[test_select_multiple] varchar(200),
-	[test_radio] varchar(10),
-	[test_checkbox] varchar(200),
-	[test_date] datetime,
-	[test_datetime] datetime,
-	[test_user_code] varchar(64),
-	[test_office_code] varchar(64),
-	[test_area_code] varchar(64),
-	[test_area_name] nvarchar(100),
-	PRIMARY KEY ([id])
-);
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE [test_tree]
-(
-	[tree_code] varchar(64) NOT NULL,
-	[parent_code] varchar(64) NOT NULL,
-	[parent_codes] varchar(767) NOT NULL,
-	[tree_sort] decimal(10) NOT NULL,
-	[tree_sorts] varchar(767) NOT NULL,
-	[tree_leaf] char(1) NOT NULL,
-	[tree_level] decimal(4) NOT NULL,
-	[tree_names] varchar(767) NOT NULL,
-	[tree_name] nvarchar(200) NOT NULL,
-	[status] char(1) DEFAULT '0' NOT NULL,
-	[create_by] varchar(64) NOT NULL,
-	[create_date] datetime NOT NULL,
-	[update_by] varchar(64) NOT NULL,
-	[update_date] datetime NOT NULL,
-	[remarks] nvarchar(500),
-	PRIMARY KEY ([tree_code])
-);
-
-
-
diff --git a/web-fast/src/main/resources/db/create/mysql/test.sql b/web-fast/src/main/resources/db/create/mysql/test.sql
deleted file mode 100644
index 06c78075..00000000
--- a/web-fast/src/main/resources/db/create/mysql/test.sql
+++ /dev/null
@@ -1,76 +0,0 @@
-SET SESSION FOREIGN_KEY_CHECKS=0;
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL COMMENT '缂栧彿',
-	test_input varchar(200) COMMENT '鍗曡鏂囨湰',
-	test_textarea varchar(200) COMMENT '澶氳鏂囨湰',
-	test_select varchar(10) COMMENT '涓嬫媺妗�',
-	test_select_multiple varchar(200) COMMENT '涓嬫媺澶氶��',
-	test_radio varchar(10) COMMENT '鍗曢�夋',
-	test_checkbox varchar(200) COMMENT '澶嶉�夋',
-	test_date datetime COMMENT '鏃ユ湡閫夋嫨',
-	test_datetime datetime COMMENT '鏃ユ湡鏃堕棿',
-	test_user_code varchar(64) COMMENT '鐢ㄦ埛閫夋嫨',
-	test_office_code varchar(64) COMMENT '鏈烘瀯閫夋嫨',
-	test_area_code varchar(64) COMMENT '鍖哄煙閫夋嫨',
-	test_area_name varchar(100) COMMENT '鍖哄煙鍚嶇О',
-	status char(1) DEFAULT '0' NOT NULL COMMENT '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�',
-	create_by varchar(64) NOT NULL COMMENT '鍒涘缓鑰�',
-	create_date datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
-	update_by varchar(64) NOT NULL COMMENT '鏇存柊鑰�',
-	update_date datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
-	remarks varchar(500) COMMENT '澶囨敞淇℃伅',
-	PRIMARY KEY (id)
-) COMMENT = '娴嬭瘯鏁版嵁';
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL COMMENT '缂栧彿',
-	test_sort int COMMENT '鎺掑簭鍙�',
-	test_data_id varchar(64) COMMENT '鐖惰〃涓婚敭',
-	test_input varchar(200) COMMENT '鍗曡鏂囨湰',
-	test_textarea varchar(200) COMMENT '澶氳鏂囨湰',
-	test_select varchar(10) COMMENT '涓嬫媺妗�',
-	test_select_multiple varchar(200) COMMENT '涓嬫媺澶氶��',
-	test_radio varchar(10) COMMENT '鍗曢�夋',
-	test_checkbox varchar(200) COMMENT '澶嶉�夋',
-	test_date datetime COMMENT '鏃ユ湡閫夋嫨',
-	test_datetime datetime COMMENT '鏃ユ湡鏃堕棿',
-	test_user_code varchar(64) COMMENT '鐢ㄦ埛閫夋嫨',
-	test_office_code varchar(64) COMMENT '鏈烘瀯閫夋嫨',
-	test_area_code varchar(64) COMMENT '鍖哄煙閫夋嫨',
-	test_area_name varchar(100) COMMENT '鍖哄煙鍚嶇О',
-	PRIMARY KEY (id)
-) COMMENT = '娴嬭瘯鏁版嵁瀛愯〃';
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL COMMENT '鑺傜偣缂栫爜',
-	parent_code varchar(64) NOT NULL COMMENT '鐖剁骇缂栧彿',
-	parent_codes varchar(767) NOT NULL COMMENT '鎵�鏈夌埗绾х紪鍙�',
-	tree_sort decimal(10) NOT NULL COMMENT '鎺掑簭鍙凤紙鍗囧簭锛�',
-	tree_sorts varchar(767) NOT NULL COMMENT '鎵�鏈夋帓搴忓彿',
-	tree_leaf char(1) NOT NULL COMMENT '鏄惁鏈�鏈骇',
-	tree_level decimal(4) NOT NULL COMMENT '灞傛绾у埆',
-	tree_names varchar(767) NOT NULL COMMENT '鍏ㄨ妭鐐瑰悕',
-	tree_name varchar(200) NOT NULL COMMENT '鑺傜偣鍚嶇О',
-	status char(1) DEFAULT '0' NOT NULL COMMENT '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�',
-	create_by varchar(64) NOT NULL COMMENT '鍒涘缓鑰�',
-	create_date datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
-	update_by varchar(64) NOT NULL COMMENT '鏇存柊鑰�',
-	update_date datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
-	remarks varchar(500) COMMENT '澶囨敞淇℃伅',
-	PRIMARY KEY (tree_code)
-) COMMENT = '娴嬭瘯鏍戣〃';
-
-
-
diff --git a/web-fast/src/main/resources/db/create/oracle/test.sql b/web-fast/src/main/resources/db/create/oracle/test.sql
deleted file mode 100644
index 4308d8d3..00000000
--- a/web-fast/src/main/resources/db/create/oracle/test.sql
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar2(64) NOT NULL,
-	test_input varchar2(200),
-	test_textarea nvarchar2(200),
-	test_select varchar2(10),
-	test_select_multiple varchar2(200),
-	test_radio varchar2(10),
-	test_checkbox varchar2(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar2(64),
-	test_office_code varchar2(64),
-	test_area_code varchar2(64),
-	test_area_name nvarchar2(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar2(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar2(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks nvarchar2(500),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar2(64) NOT NULL,
-	test_sort number(10,0),
-	test_data_id varchar2(64),
-	test_input varchar2(200),
-	test_textarea nvarchar2(200),
-	test_select varchar2(10),
-	test_select_multiple varchar2(200),
-	test_radio varchar2(10),
-	test_checkbox varchar2(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar2(64),
-	test_office_code varchar2(64),
-	test_area_code varchar2(64),
-	test_area_name nvarchar2(100),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar2(64) NOT NULL,
-	parent_code varchar2(64) NOT NULL,
-	parent_codes varchar2(767) NOT NULL,
-	tree_sort number(10) NOT NULL,
-	tree_sorts varchar2(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level number(4) NOT NULL,
-	tree_names varchar2(767) NOT NULL,
-	tree_name nvarchar2(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar2(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar2(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks nvarchar2(500),
-	PRIMARY KEY (tree_code)
-);
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '娴嬭瘯鏁版嵁';
-COMMENT ON COLUMN test_data.id IS '缂栧彿';
-COMMENT ON COLUMN test_data.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON COLUMN test_data.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_data.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_data.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_data.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_data.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_data.remarks IS '澶囨敞淇℃伅';
-COMMENT ON TABLE test_data_child IS '娴嬭瘯鏁版嵁瀛愯〃';
-COMMENT ON COLUMN test_data_child.id IS '缂栧彿';
-COMMENT ON COLUMN test_data_child.test_sort IS '鎺掑簭鍙�';
-COMMENT ON COLUMN test_data_child.test_data_id IS '鐖惰〃涓婚敭';
-COMMENT ON COLUMN test_data_child.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data_child.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data_child.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data_child.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON TABLE test_tree IS '娴嬭瘯鏍戣〃';
-COMMENT ON COLUMN test_tree.tree_code IS '鑺傜偣缂栫爜';
-COMMENT ON COLUMN test_tree.parent_code IS '鐖剁骇缂栧彿';
-COMMENT ON COLUMN test_tree.parent_codes IS '鎵�鏈夌埗绾х紪鍙�';
-COMMENT ON COLUMN test_tree.tree_sort IS '鎺掑簭鍙凤紙鍗囧簭锛�';
-COMMENT ON COLUMN test_tree.tree_sorts IS '鎵�鏈夋帓搴忓彿';
-COMMENT ON COLUMN test_tree.tree_leaf IS '鏄惁鏈�鏈骇';
-COMMENT ON COLUMN test_tree.tree_level IS '灞傛绾у埆';
-COMMENT ON COLUMN test_tree.tree_names IS '鍏ㄨ妭鐐瑰悕';
-COMMENT ON COLUMN test_tree.tree_name IS '鑺傜偣鍚嶇О';
-COMMENT ON COLUMN test_tree.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_tree.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_tree.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_tree.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_tree.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_tree.remarks IS '澶囨敞淇℃伅';
-
-
-
diff --git a/web-fast/src/main/resources/db/create/postgresql/test.sql b/web-fast/src/main/resources/db/create/postgresql/test.sql
deleted file mode 100644
index 54758d68..00000000
--- a/web-fast/src/main/resources/db/create/postgresql/test.sql
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL,
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (id)
-) WITHOUT OIDS;
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL,
-	test_sort int,
-	test_data_id varchar(64),
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	PRIMARY KEY (id)
-) WITHOUT OIDS;
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	tree_name varchar(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (tree_code)
-) WITHOUT OIDS;
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '娴嬭瘯鏁版嵁';
-COMMENT ON COLUMN test_data.id IS '缂栧彿';
-COMMENT ON COLUMN test_data.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON COLUMN test_data.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_data.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_data.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_data.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_data.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_data.remarks IS '澶囨敞淇℃伅';
-COMMENT ON TABLE test_data_child IS '娴嬭瘯鏁版嵁瀛愯〃';
-COMMENT ON COLUMN test_data_child.id IS '缂栧彿';
-COMMENT ON COLUMN test_data_child.test_sort IS '鎺掑簭鍙�';
-COMMENT ON COLUMN test_data_child.test_data_id IS '鐖惰〃涓婚敭';
-COMMENT ON COLUMN test_data_child.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data_child.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data_child.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data_child.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON TABLE test_tree IS '娴嬭瘯鏍戣〃';
-COMMENT ON COLUMN test_tree.tree_code IS '鑺傜偣缂栫爜';
-COMMENT ON COLUMN test_tree.parent_code IS '鐖剁骇缂栧彿';
-COMMENT ON COLUMN test_tree.parent_codes IS '鎵�鏈夌埗绾х紪鍙�';
-COMMENT ON COLUMN test_tree.tree_sort IS '鎺掑簭鍙凤紙鍗囧簭锛�';
-COMMENT ON COLUMN test_tree.tree_sorts IS '鎵�鏈夋帓搴忓彿';
-COMMENT ON COLUMN test_tree.tree_leaf IS '鏄惁鏈�鏈骇';
-COMMENT ON COLUMN test_tree.tree_level IS '灞傛绾у埆';
-COMMENT ON COLUMN test_tree.tree_names IS '鍏ㄨ妭鐐瑰悕';
-COMMENT ON COLUMN test_tree.tree_name IS '鑺傜偣鍚嶇О';
-COMMENT ON COLUMN test_tree.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_tree.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_tree.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_tree.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_tree.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_tree.remarks IS '澶囨敞淇℃伅';
-
-
-
diff --git a/web-fast/src/main/resources/mappings/modules/test/TestDataChildDao.xml b/web-fast/src/main/resources/mappings/modules/test/TestDataChildDao.xml
deleted file mode 100644
index badbe182..00000000
--- a/web-fast/src/main/resources/mappings/modules/test/TestDataChildDao.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jeesite.modules.test.dao.TestDataChildDao">
-	
-	<!-- 鏌ヨ鏁版嵁
-	<select id="findList" resultType="TestDataChild">
-		SELECT ${sqlMap.column.toSql()}
-		FROM ${sqlMap.table.toSql()}
-		<where>
-			${sqlMap.where.toSql()}
-		</where>
-		ORDER BY ${sqlMap.order.toSql()}
-	</select> -->
-	
-</mapper>
\ No newline at end of file
diff --git a/web-fast/src/main/resources/mappings/modules/test/TestDataDao.xml b/web-fast/src/main/resources/mappings/modules/test/TestDataDao.xml
deleted file mode 100644
index c21f5521..00000000
--- a/web-fast/src/main/resources/mappings/modules/test/TestDataDao.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jeesite.modules.test.dao.TestDataDao">
-	
-	<!-- 鏌ヨ鏁版嵁
-	<select id="findList" resultType="TestData">
-		SELECT ${sqlMap.column.toSql()}
-		FROM ${sqlMap.table.toSql()}
-		<where>
-			${sqlMap.where.toSql()}
-		</where>
-		ORDER BY ${sqlMap.order.toSql()}
-	</select> -->
-	
-	<!-- 婕旂ずMap鍙傛暟鍜岃繑鍥炲�硷紝鏀寔鍒嗛〉 -->
-	<select id="findListForMap" resultType="map">
-		SELECT * FROM test_data a
-		<where>
-			<if test="testInput != null and testInput != ''">
-				AND a.test_input = #{testInput}
-			</if>
-		</where>
-		<if test="page != null and page.orderBy != null and page.orderBy != ''">
-			ORDER BY ${page.orderBy}
-		</if>
-	</select>
-	
-</mapper>
\ No newline at end of file
diff --git a/web-fast/src/main/resources/mappings/modules/test/TestTreeDao.xml b/web-fast/src/main/resources/mappings/modules/test/TestTreeDao.xml
deleted file mode 100644
index 7486b49e..00000000
--- a/web-fast/src/main/resources/mappings/modules/test/TestTreeDao.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jeesite.modules.test.dao.TestTreeDao">
-	
-	<!-- 鏌ヨ鏁版嵁
-	<select id="findList" resultType="TestTree">
-		SELECT ${sqlMap.column.toSql()}
-		FROM ${sqlMap.table.toSql()}
-		<where>
-			${sqlMap.where.toSql()}
-		</where>
-		ORDER BY ${sqlMap.order.toSql()}
-	</select> -->
-	
-</mapper>
\ No newline at end of file
diff --git a/web-fast/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html b/web-fast/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
deleted file mode 100644
index 81164591..00000000
--- a/web-fast/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
+++ /dev/null
@@ -1,234 +0,0 @@
-<% layout('/layouts/default.html', {title: '澶氳〃澶村垎缁勫皬璁″悎璁�', libs: ['dataGrid']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header">
-			<div class="box-title">
-				<i class="fa icon-notebook"></i> 澶氳〃澶村垎缁勫皬璁″悎璁�
-			</div>
-			<div class="box-tools pull-right">
-				<a href="#" class="btn btn-default" id="btnSearch" title="鏌ヨ"><i class="fa fa-filter"></i> 鏌ヨ</a>
-				<% if(hasPermi('test:testData:edit')){ %>
-					<a href="${ctx}/test/testData/form" class="btn btn-default btnTool" title="鏂板鏁版嵁"><i class="fa fa-plus"></i> 鏂板</a>
-				<% } %>
-				<a href="${ctx}/demo/dataGrid/stateGrid" class="btn btn-default btnTool" title="缁熻琛ㄦ牱渚�"><i class="fa fa-hand-lizard-o"></i> 缁熻琛ㄦ牱渚�</a>
-			</div>
-		</div>
-		<div class="box-body">
-			<#form:form id="searchForm" model="${testData}" action="${ctx}/test/testData/listData" method="post" class="form-inline hide"
-					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<div class="form-group">
-					<label class="control-label">鍗曡鏂囨湰锛�</label>
-					<div class="control-inline">
-						<#form:input path="testInput" maxlength="200" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">澶氳鏂囨湰锛�</label>
-					<div class="control-inline">
-						<#form:input path="testTextarea" maxlength="200" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">涓嬫媺妗嗭細</label>
-					<div class="control-inline width-120">
-						<#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">涓嬫媺澶氶�夛細</label>
-					<div class="control-inline width-120">
-						<#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">鍗曢�夋锛�</label>
-					<div class="control-inline">
-						<#form:radio path="testRadio" dictType="sys_menu_type" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">澶嶉�夋锛�</label>
-					<div class="control-inline">
-						<#form:checkbox path="testCheckbox" dictType="sys_menu_type" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">鏃ユ湡閫夋嫨锛�</label>
-					<div class="control-inline">
-						<#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date"
-							dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.click()"/>
-						&nbsp;-&nbsp;
-						<#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date"
-							dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">鏃ユ湡鏃堕棿锛�</label>
-					<div class="control-inline">
-						<#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
-							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.click()"/>
-						&nbsp;-&nbsp;
-						<#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
-							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">鐢ㄦ埛閫夋嫨锛�</label>
-					<div class="control-inline width-120" >
-						<#form:treeselect id="testUser" title="鐢ㄦ埛閫夋嫨"
-							path="testUser.userCode" labelPath="testUser.userName" 
-							url="${ctx}/sys/office/treeData?isLoadUser=true" allowClear="true"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">鏈烘瀯閫夋嫨锛�</label>
-					<div class="control-inline width-120" >
-						<#form:treeselect id="testOffice" title="鏈烘瀯閫夋嫨"
-							path="testOffice.officeCode" labelPath="testOffice.officeName" 
-							url="${ctx}/sys/office/treeData" allowClear="true"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">鍖哄煙閫夋嫨锛�</label>
-					<div class="control-inline width-120" >
-						<#form:treeselect id="testAreaCode" title="鍖哄煙閫夋嫨"
-							path="testAreaCode" labelPath="testAreaName" 
-							url="${ctx}/sys/area/treeData" allowClear="true"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">鐘舵�侊細</label>
-					<div class="control-inline width-120">
-						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">澶囨敞淇℃伅锛�</label>
-					<div class="control-inline">
-						<#form:input path="remarks" maxlength="500" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<button type="submit" class="btn btn-primary btn-sm"><i class="glyphicon glyphicon-search"></i> ${text('鏌ヨ')}</button>
-					<button type="reset" class="btn btn-default btn-sm isQuick"><i class="glyphicon glyphicon-repeat"></i> ${text('閲嶇疆')}</button>
-				</div>
-			</#form:form>
-			<table id="dataGrid"></table>
-			<div id="dataGridPage"></div>
-		</div>
-	</div>
-</div>
-<% } %>
-<script>
-//# // 鍒濆鍖朌ataGrid瀵硅薄
-$('#dataGrid').dataGrid({
-	searchForm: $("#searchForm"),
-	columnModel: [
-		{header:'鍗曡鏂囨湰', name:'testInput', index:'a.test_input', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){
-			if(obj.rowId == ''){ return '灏忚:'; }
-			return '<a href="${ctx}/test/testData/form?id='+row.id+'" class="btnList" data-title="缂栬緫鏁版嵁">'+(val||row.id)+'</a>';
-		}, summaryTpl: "<em>{0}</em> ", summaryType: "count"},
-		{header:'澶氳鏂囨湰', name:'testTextarea', index:'a.test_textarea', width:200, align:"center", formatter: function(val, obj, row, act){
-			if(obj.rowId == ''){ return '<em>' + val + '</em>涓�' }
-			return val||'';
-		}, summaryTpl: "<em>{0}</em>", summaryType: "count"},
-		{header:'閲戦', name:'id', index:'a.id', width:150, align:"right", formatter: function(val, obj, row, act){
-			val = js.formatMoney(val/(1000*1000*1000*1000));
-			if(obj.rowId == ''){ return (val != '') ? ('锟�' + val) : ''; }
-			return val;
-		}, summaryTpl: "<em>{0}</em> ", summaryType: "sum"},
-		{header:'涓嬫媺妗�', name:'testSelect', index:'a.test_select', width:150, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_menu_type')}", val, '鏈煡', true);
-		}},
-		{header:'涓嬫媺澶氶��', name:'testSelectMultiple', index:'a.test_select_multiple', width:150, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_menu_type')}", val, '鏈煡', true);
-		}},
-		{header:'鍗曢�夋', name:'testRadio', index:'a.test_radio', width:150, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_menu_type')}", val, '鏈煡', true);
-		}},
-		{header:'澶嶉�夋', name:'testCheckbox', index:'a.test_checkbox', width:150, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_menu_type')}", val, '鏈煡', true);
-		}},
-		{header:'鏃ユ湡閫夋嫨', name:'testDate', index:'a.test_date', width:150, align:"center"},
-		{header:'鏃ユ湡鏃堕棿', name:'testDatetime', index:'a.test_datetime', width:150, align:"center"},
-		{header:'鐢ㄦ埛閫夋嫨', name:'testUser.userName', index:'a.test_user_code', width:150, align:"center"},
-		{header:'鏈烘瀯閫夋嫨', name:'testOffice.officeName', index:'a.test_office_code', width:150, align:"center"},
-		{header:'鍖哄煙閫夋嫨', name:'testAreaName', index:'a.test_area_code', width:150, align:"center"},
-		{header:'鍖哄煙鍚嶇О', name:'testAreaName', index:'a.test_area_name', width:150, align:"left"},
-		{header:'鐘舵��', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_search_status')}", val, '鏈煡', true);
-		}},
-		{header:'鍒涘缓鏃堕棿', name:'createDate', index:'a.create_date', width:150, align:"center"},
-		{header:'澶囨敞淇℃伅', name:'remarks', index:'a.remarks', width:150, align:"left"},
-		{header:'鎿嶄綔', name:'actions', width:120, formatter: function(val, obj, row, act){
-			var actions = [];
-			//# if(hasPermi('test:testData:edit')){
-				actions.push('<a href="${ctx}/test/testData/form?id='+row.id+'" class="btnList" title="缂栬緫鏁版嵁"><i class="fa fa-pencil"></i></a>&nbsp;');
-				if (row.status == Global.STATUS_NORMAL){
-					actions.push('<a href="${ctx}/test/testData/disable?id='+row.id+'" class="btnList" title="鍋滅敤鏁版嵁" data-confirm="纭瑕佸仠鐢ㄨ鏁版嵁鍚楋紵"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
-				} else if (row.status == Global.STATUS_DISABLE){
-					actions.push('<a href="${ctx}/test/testData/enable?id='+row.id+'" class="btnList" title="鍚敤鏁版嵁" data-confirm="纭瑕佸惎鐢ㄨ鏁版嵁鍚楋紵"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
-				}
-				actions.push('<a href="${ctx}/test/testData/delete?id='+row.id+'" class="btnList" title="鍒犻櫎鏁版嵁" data-confirm="纭瑕佸垹闄よ鏁版嵁鍚楋紵"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			//# }
-			return actions.join('');
-		}}
-	],
-	
-	shrinkToFit: false, // 鏄惁鎸夌櫨鍒嗘瘮鑷姩璋冩暣鍒楀锛屽綋鍒楁瘮杈冨鏃讹紝寮�鍚按骞虫粴鍔紝鍙缃负false
-	frozenCols: true, 	// 鍚敤鍐荤粨鍒楋紝骞跺湪colModel涓缃甪rozen:true
-	showRownum: true,	// 鏄惁鏄剧ず琛屽彿锛岄粯璁rue
-	showFooter: true,	// 鏄惁鏄剧ず搴曢儴鍚堣琛岋紝鏁版嵁杞藉叆璇﹁ ajaxSuccess
-
-	// ================ 璁剧疆澶氱骇琛ㄥご BEGIN ==============
-	// 璁剧疆澶氱骇琛ㄥご
-	groupHeaders: {
- 		twoLevel:[
- 			{startColumnName: 'testSelect', numberOfColumns: 2, titleText: '浜岀骇琛ㄥご'},
- 			{startColumnName: 'testRadio', numberOfColumns:2, titleText:'浜岀骇琛ㄥご2'}
- 		],
- 		threeLevel:[
- 			{startColumnName: 'testSelect', numberOfColumns:4, titleText:'涓夌骇琛ㄥご'}
- 		]
-	},
-	// ================ 璁剧疆澶氱骇琛ㄥご END ==============
-
-	// ================ 鍒嗙粍锛屽皬璁� BEGIN ==============
-	grouping: true, 	// 鏄惁鍒嗙粍鏄剧ず
-	groupingView: {
-		groupField: ["status"], // 闇�瑕佸垎缁勭殑鍒�
-		groupColumnShow: [false],// 鏄惁鏄剧ず鍒嗙粍鐨勫垪
-		groupText: ["<b>{0}</b>"],	// 璁剧疆缁勬爣棰橈紝鍔犵矖鏍囬锛歔"<b>{0}</b>"]锛屼笉鏄剧ず鏍囬锛歔"none"]
-		groupSummary: [true],	// 鏄惁鏄剧ず[灏忚]鍒楋紝鏁版嵁杞藉叆璇﹁ columnModel.formatter
-		groupCollapse: false 	// false涓洪粯璁ゅ睍寮�锛宼rue榛樿涓烘姌鍙�
-	},
-	// ================ 鍒嗙粍锛屽皬璁� END ==============
-	
-	//# // 鍔犺浇鎴愬姛鍚庢墽琛屼簨浠�
-	ajaxSuccess: function(data){
-		
-		// 鍒嗙粍鍜屽喕缁撳垪鎯呭喌涓嬬殑鍚堝苟鍗曞厓鏍兼祴璇�
-		//$('#dataGrid').dataGrid("mergeCell", "testInput,id");
-		
-		// ================ 鍚敤鍚堣琛� BEGIN ==============
-		// showFooter: true, // 鏄惁鏄剧ず搴曢儴鍚堣琛�
-		// 绗� 1 绉嶆柟娉曪細璇锋眰瀹屾垚涔嬪悗閫氳繃js璁剧疆锛屼妇渚嬪涓嬶細
-		// 璁剧疆搴曢儴鍚堣琛屾暟鎹紙璁剧疆鍚堣琛岋級
-		$('#dataGrid').dataGrid("footerData", "set", {
-			"testInput" : "<center><em>鍚堣锛�</em></center>",
-			"testTextarea" : "<em>" + data.count + "</em>涓�",
-			"id": "<em>锟�900,000,000.00 &nbsp;</em>"
-		}, false);
-		// 绗� 2 绉嶆柟娉曪細鍦ㄨ繑鍥炵粨鏋滈泦涓缃� otherData灞炴�э紝涓句緥鏍煎紡濡備笅锛�
-		/* {"pageNo":1, "pageSize":30, "list":[杩斿洖缁撴灉闆嗘暟鎹甝,
-			"otherData":{
-				"testInput" : "<center><em>鍚堣锛�</em></center>",
-				"testTextarea" : "<em>" + data.count + "</em>涓�",
-				"id": "<em>锟�900,000,000.00 &nbsp;</em>"
-			}
-		   } */
-		// ================ 鍚敤鍚堣琛� END ================
-		
-	}
-});
-</script>
\ No newline at end of file
diff --git a/web-fast/src/main/resources/views/modules/demo/demoDataGridStateGrid.html b/web-fast/src/main/resources/views/modules/demo/demoDataGridStateGrid.html
deleted file mode 100644
index 6b4e6efb..00000000
--- a/web-fast/src/main/resources/views/modules/demo/demoDataGridStateGrid.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<% layout('/layouts/default.html', {title: '缁熻琛ㄦ牱渚�', libs: ['dataGrid']}){ %>
-<style>
-    .ui-jqgrid tr.jqgrow td {
-        padding: 0 !important;
-    }
-    .ui-jqgrid .sum-child{
-        width: 100%;
-        height: 100%;
-        line-height: 35px;
-        background-color: #f0f0f0;
-    }
-    .ui-jqgrid .sum-parent {
-        background-color: #65a1db;
-        color: white;
-    }
-</style>
-<div class="main-content">
-    <div class="box box-main">
-        <div class="box-header">
-            <div class="box-title">
-                <i class="fa fa-list-alt"></i> ${text('缁熻琛ㄦ牱渚�')}
-            </div>
-            <div class="box-tools pull-right">
-                <a href="#" class="btn btn-default" id="btnSearch" title="${text('鏌ヨ')}"><i class="fa fa-filter"></i> ${text('鏌ヨ')}</a>
-                <a href="${ctx}/psi/wechatUser/form" class="btn btn-default btnTool" title="${text('鏂板寰俊鐢ㄦ埛琛�')}"><i class="fa fa-plus"></i> ${text('鏂板')}</a>
-            </div>
-        </div>
-        <div class="box-body">
-            <#form:form id="searchForm" class="form-inline hide" >
-            <div class="form-group">
-                <label class="control-label">${text('鏃堕棿')}锛�</label>
-                <div class="control-inline width-150">
-                    <#form:input path="dateStart" readonly="true" maxlength="20" class="form-control laydate width-datetime"
-                    	dataFormat="date" />
-                    &nbsp;--&nbsp;
-                    <#form:input path="dateEnd" readonly="true" maxlength="20" class="form-control laydate width-datetime"
-                    	dataFormat="date" />
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="control-label">鍖哄煙閫夋嫨锛�</label>
-                <div class="control-inline width-120" >
-                    <#form:treeselect id="areaId" title="鍖哄煙閫夋嫨"
-	                    path="areaId" canSelectParent="true" canSelectRoot="true"
-	                    url="${ctx}/sys/area/treeData?parentCode=0" allowClear="true"/>
-                </div>
-            </div>
-            <div class="form-group">
-                <button type="button" id="search" class="btn btn-primary btn-sm">${text('鏌ヨ')}</button>
-                <button type="reset" class="btn btn-default btn-sm isQuick">${text('閲嶇疆')}</button>
-            </div>
-        </#form:form>
-        <table id="dataGrid"></table>
-    </div>
-</div>
-</div>
-<% } %>
-<script>
-var dataGridData = {
-    data: [
-        {name:"瀹㈡埛1-1-1",quantity:1,amount:0,return:0,virtual:0,balance:0,parentArea:'钀ラ攢1閮�',childArea:'鐪佸尯1-1'},
-        {name:"瀹㈡埛1-1-2",quantity:0,amount:2,return:0,virtual:0,balance:0,parentArea:'钀ラ攢1閮�',childArea:'鐪佸尯1-1'},
-        {name:"鐗囧尯鍚堣",quantity:1,amount:2,return:0,virtual:0,balance:0,sumSet:'child',parentArea:'钀ラ攢1閮�',childArea:'鐗囧尯鍚堣'},
-        {name:"澶у尯鍚堣",quantity:1,amount:2,return:0,virtual:0,balance:0,sumSet:'parent',parentArea:'澶у尯鍚堣',childArea:'澶у尯鍚堣'},
-        {name:"瀹㈡埛2-1-1",quantity:0,amount:0,return:0,virtual:0,balance:0,parentArea:'钀ラ攢2閮�',childArea:'鐪佸尯2-1'},
-        {name:"瀹㈡埛2-1-2",quantity:0,amount:0,return:3,virtual:0,balance:0,parentArea:'钀ラ攢2閮�',childArea:'鐪佸尯2-1'},
-        {name:"鐗囧尯鍚堣",quantity:0,amount:0,return:3,virtual:4,balance:0,sumSet:'child',parentArea:'钀ラ攢2閮�',childArea:'鐗囧尯鍚堣'},
-        {name:"瀹㈡埛2-2-1",quantity:0,amount:0,return:0,virtual:0,balance:0,parentArea:'钀ラ攢2閮�',childArea:'鐪佸尯2-2'},
-        {name:"瀹㈡埛2-2-2",quantity:0,amount:0,return:0,virtual:0,balance:5,parentArea:'钀ラ攢2閮�',childArea:'鐪佸尯2-2'},
-        {name:"鐗囧尯鍚堣",quantity:0,amount:0,return:0,virtual:0,balance:5,sumSet:'child',parentArea:'钀ラ攢2閮�',childArea:'鐗囧尯鍚堣'},
-        {name:"澶у尯鍚堣",quantity:0,amount:0,return:3,virtual:4,balance:5,sumSet:'parent',parentArea:'澶у尯鍚堣',childArea:'澶у尯鍚堣'}
-    ], sum: {quantity:1,amount:2,return:3,virtual:4,balance:5}
-}
-
-function formatter(val, obj, row, act) {
-    if (row.sumSet === 'child') {
-        return '<div class="sum-child">' + val + '</div>'
-    } else if (row.sumSet === 'parent') {
-        return '<div class="sum-child sum-parent">' + val + '</div>'
-    } else {
-        return val
-    }
-}
-
-//# // 鍒濆鍖朌ataGrid瀵硅薄
-$('#dataGrid').dataGrid({
-    searchForm: $("#searchForm"),
-    data: dataGridData.data,
-    datatype: "local", // 璁剧疆鏈湴鏁版嵁
-    columnModel: [
-        {
-            header: '澶у尯', name: 'parentArea', align: 'center', width: 150, sortable: false, formatter: formatter,
-            cellattr: function (rowId, tv, row, cm, val) {
-                if (row.sumSet === 'parent') {
-                    return ' colspan=3'
-                }
-            }
-        },
-        {
-            header: '鐗囧尯', name: 'childArea', align: 'center', width: 150, sortable: false, formatter: formatter,
-            cellattr: function (rowId, tv, row, cm, val) {
-                if (row.sumSet === 'parent') {
-                    return ' style="display:none;'
-                }
-                if (row.sumSet === 'child') {
-                    return ' colspan=2'
-                }
-            }
-        },
-        {
-            header: '瀹㈡埛', name: 'name', align: 'center', width: 150, sortable: false, formatter: formatter,
-            cellattr: function (rowId, tv, row, cm, val) {
-                if (row.sumSet === 'parent' || row.sumSet === 'child') {
-                    return ' style="display:none;'
-                }
-            }
-        },
-        {header: '鏁伴噺', name: 'quantity', align: 'center', width: 150, sortable: false, formatter: formatter},
-        {header: '閲戦', name: 'amount', align: 'center', width: 150, sortable: false, formatter: formatter},
-        {header: '鎬诲洖娆�', name: 'return', align: 'center', width: 150, sortable: false, formatter: formatter},
-        {header: '铏氭嫙璐ф', name: 'virtual', align: 'center', width: 150, sortable: false, formatter: formatter},
-        {header: '鏈�鏂颁綑棰�', name: 'balance', align: 'center', width: 150, sortable: false, formatter: formatter}
-    ],
-    altRows: false,
-    groupHeaders: {
-        threeLevel: [
-            {startColumnName: 'parentArea', numberOfColumns: 8, titleText: '鏃堕棿'}
-        ],
-        twoLevel: [
-            {startColumnName: 'quantity', numberOfColumns: 2, titleText: '鍙戣揣', width: 150},
-            {startColumnName: 'return', numberOfColumns: 2, titleText: '鍥炴', width: 150}
-        ]
-    },
-    showRownum: true,	// 鏄惁鏄剧ず琛屽彿锛岄粯璁rue
-    showFooter: true,	// 鏄惁鏄剧ず搴曢儴鍚堣琛岋紝鏁版嵁杞藉叆璇﹁ ajaxSuccess
-    //# // 鍔犺浇鎴愬姛鍚庢墽琛屼簨浠�
-    ajaxSuccess: function (data) {
-        $('#dataGrid').dataGrid('mergeCell', 'parentArea,childArea');
-        $('#dataGrid').dataGrid("footerData", "set", {
-            "parentArea": "<center><em>鍚堣锛�</em></center>",
-            "quantity": "<em>" + dataGridData.sum.quantity + "</em>",
-            "amount": "<em>" + dataGridData.sum.amount + "</em>",
-            "return": "<em>" + dataGridData.sum.return + "</em>",
-            "virtual": "<em>" + dataGridData.sum.virtual + "</em>",
-            "balance": "<em>" + dataGridData.sum.balance + "</em>",
-        }, false);
-    }
-});
-</script>
\ No newline at end of file
diff --git a/web-fast/src/main/resources/views/modules/demo/demoFormLayoutForm.html b/web-fast/src/main/resources/views/modules/demo/demoFormLayoutForm.html
deleted file mode 100644
index 4c269a1f..00000000
--- a/web-fast/src/main/resources/views/modules/demo/demoFormLayoutForm.html
+++ /dev/null
@@ -1,279 +0,0 @@
-<% layout('/layouts/default.html', {title: '鏁版嵁绠＄悊', libs: ['validate','fileupload','ueditor','dataGrid']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header with-border">
-			<div class="box-title">
-				<i class="fa icon-notebook"></i> ${testData.isNewRecord ? '鏂板鏁版嵁' : '缂栬緫鏁版嵁'}
-			</div>
-			<div class="box-tools pull-right hide">
-				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-			</div>
-		</div>
-		<#form:form id="inputForm" model="${testData}" action="${ctx}/test/testData/save" method="post" class="form-horizontal">
-			<div class="box-body">
-				<div class="form-unit">涓�鍒�</div>
-				<#form:hidden path="id"/>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2" title="">
-								<span class="required hide">*</span> 鍗曡鏂囨湰锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-10">
-								<#form:input path="testInput" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2" title="">
-								<span class="required hide">*</span> 澶氳鏂囨湰锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-10">
-								<#form:textarea path="testTextarea" rows="4" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="form-unit">涓ゅ垪</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 涓嬫媺妗嗭細<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control" />
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 涓嬫媺澶氶�夛細<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control" />
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鍗曢�夋锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:radio path="testRadio" dictType="sys_menu_type" class="form-control" />
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 澶嶉�夋锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:checkbox path="testCheckbox" dictType="sys_menu_type" class="form-control" />
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="form-unit">涓夊垪</div>
-				<div class="row">
-					<div class="col-xs-4">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鏃ユ湡锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="testDate" readonly="true" maxlength="20" class="form-control laydate "
-									dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-4">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鏃堕棿锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="testDatetime" readonly="true" maxlength="20" class="form-control laydate "
-									dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-4">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鐢ㄦ埛锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:treeselect id="testUser" title="鐢ㄦ埛閫夋嫨"
-									path="testUser.userCode" labelPath="testUser.userName"
-									url="${ctx}/sys/office/treeData?isLoadUser=true"
-									class="" allowClear="true"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-4">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鏈烘瀯锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:treeselect id="testOffice" title="鏈烘瀯閫夋嫨"
-									path="testOffice.officeCode" labelPath="testOffice.officeName"
-									url="${ctx}/sys/office/treeData"
-									class="" allowClear="true"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-4">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鍖哄煙锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:treeselect id="testAreaCode" title="鍖哄煙閫夋嫨"
-									path="testAreaCode" labelPath="testAreaName"
-									url="${ctx}/sys/area/treeData"
-									class="" allowClear="true"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-4">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 澶囨敞锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="remarks" class="form-control"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<style>
-								/* 鏍呮牸9鍒楀竷灞� */
-								@media (min-width: 768px){
-									.col-sm-9-1{width:11.11%}
-									.col-sm-9-2{width:22.22%}
-									.col-sm-9-3{width:33.33%}
-									.col-sm-9-4{width:44.44%}
-									.col-sm-9-5{width:55.55%}
-									.col-sm-9-6{width:66.66%}
-									.col-sm-9-7{width:77.77%}
-									.col-sm-9-8{width:88.88%}
-								}
-							</style>
-							<label class="control-label col-sm-2 col-sm-9-1" title="">
-								<span class="required hide">*</span> 鍗曡鏂囨湰锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-10 col-sm-9-8">
-								<#form:input path="testInput" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="form-unit">鍥涘垪</div>
-				<div class="row">
-					<div class="col-xs-3">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鏂囨湰锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="testInput" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-3">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鏂囨湰锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="testInput" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-3">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鏂囨湰锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="testInput" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-3">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鏂囨湰锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="testInput" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-3">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鏂囨湰锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="testInput" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-3">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鏂囨湰锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="testInput" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-3">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鏂囨湰锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="testInput" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-3">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鏂囨湰锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="testInput" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="box-footer">
-				<div class="row">
-					<div class="col-sm-offset-2 col-sm-10">
-						<% if (hasPermi('test:testData:edit')){ %>
-							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> 淇� 瀛�</button>&nbsp;
-						<% } %>
-						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> 鍏� 闂�</button>
-					</div>
-				</div>
-			</div>
-		</#form:form>
-	</div>
-</div>
-<% } %>
-<script>
-$("#inputForm").validate({
-	submitHandler: function(form){
-// 		js.ajaxSubmitForm($(form), function(data){
-//			js.showMessage(data.message);
-//			if(data.result == Global.TRUE){
-//				js.closeCurrentTabPage(function(contentWindow){
-//					contentWindow.page();
-//				});
-//			}
-//		}, "json");
-		js.showMessage('妯℃嫙淇濆瓨鎴愬姛');
-    }
-});
-</script>
\ No newline at end of file
diff --git a/web-fast/src/main/resources/views/modules/test/testDataList.html b/web-fast/src/main/resources/views/modules/test/testDataList.html
deleted file mode 100644
index 50dee2bb..00000000
--- a/web-fast/src/main/resources/views/modules/test/testDataList.html
+++ /dev/null
@@ -1,244 +0,0 @@
-<% layout('/layouts/default.html', {title: '鏁版嵁绠＄悊', libs: ['dataGrid']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header">
-			<div class="box-title">
-				<i class="fa icon-notebook"></i> ${text('鏁版嵁绠＄悊')}
-			</div>
-			<div class="box-tools pull-right">
-				<a href="#" class="btn btn-default" id="btnSearch" title="${text('鏌ヨ')}"><i class="fa fa-filter"></i> ${text('鏌ヨ')}</a>
-				<% if(hasPermi('test:testData:edit')){ %>
-					<a href="${ctx}/test/testData/form" class="btn btn-default btnTool" title="${text('鏂板鏁版嵁')}"><i class="fa fa-plus"></i> ${text('鏂板')}</a>
-				<% } %>
-				<a href="#" class="btn btn-default" id="btnTrunsTest" title="浜嬪姟娴嬭瘯"><i class="fa fa-refresh"></i> 浜嬪姟娴嬭瘯</a>
-				<a href="#" class="btn btn-default" id="btnSetting" title="${text('璁剧疆')}"><i class="fa fa-navicon"></i></a>
-			</div>
-		</div>
-		<div class="box-body">
-			<#form:form id="searchForm" model="${testData}" action="${ctx}/test/testData/listData" method="post" class="form-inline "
-					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<div class="form-group">
-					<label class="control-label">${text('鍗曡鏂囨湰')}锛�</label>
-					<div class="control-inline">
-						<#form:input path="testInput" maxlength="200" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group hide">
-					<label class="control-label">${text('澶氳鏂囨湰')}锛�</label>
-					<div class="control-inline">
-						<#form:input path="testTextarea" maxlength="200" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('涓嬫媺妗�')}锛�</label>
-					<div class="control-inline width-120">
-						<#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('鏃ユ湡閫夋嫨')}锛�</label>
-					<div class="control-inline">
-						<#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date"
-							dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.click()"/>
-						&nbsp;-&nbsp;
-						<#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date"
-							dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<button type="submit" class="btn btn-primary btn-sm"><i class="glyphicon glyphicon-search"></i> ${text('鏌ヨ')}</button>
-					<button type="reset" class="btn btn-default btn-sm isQuick"><i class="glyphicon glyphicon-repeat"></i> ${text('閲嶇疆')}</button>
-					<button type="button" class="btn btn-default btn-sm btnFormMore"><i class="fa fa-angle-double-down"></i> ${text('鏇村')}</button>
-				</div>
-				<div class="form-more">
-					<div class="form-group">
-						<label class="control-label">${text('鏃ユ湡鏃堕棿')}锛�</label>
-						<div class="control-inline">
-							<#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
-								dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.click()"/>
-							&nbsp;-&nbsp;
-							<#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
-								dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label">${text('鐢ㄦ埛閫夋嫨')}锛�</label>
-						<div class="control-inline width-120" >
-							<#form:treeselect id="testUser" title="${text('鐢ㄦ埛閫夋嫨')}"
-								path="testUser.userCode" labelPath="testUser.userName" 
-								url="${ctx}/sys/office/treeData?isLoadUser=true" allowClear="true"/>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label">${text('鏈烘瀯閫夋嫨')}锛�</label>
-						<div class="control-inline width-120" >
-							<#form:treeselect id="testOffice" title="${text('鏈烘瀯閫夋嫨')}"
-								path="testOffice.officeCode" labelPath="testOffice.officeName" 
-								url="${ctx}/sys/office/treeData" allowClear="true"/>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label">${text('鍖哄煙閫夋嫨')}锛�</label>
-						<div class="control-inline width-120" >
-							<#form:treeselect id="testAreaCode" title="${text('鍖哄煙閫夋嫨')}"
-								path="testAreaCode" labelPath="testAreaName" 
-								url="${ctx}/sys/area/treeData" allowClear="true"/>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label">${text('涓嬫媺澶氶��')}锛�</label>
-						<div class="control-inline width-120">
-							<#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control"/>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label">${text('鏁版嵁鐘舵��')}锛�</label>
-						<div class="control-inline width-120">
-							<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label">${text('鍗曢�夋')}锛�</label>
-						<div class="control-inline">
-							<#form:radio path="testRadio" dictType="sys_menu_type" blankOption="true" class="form-control"/>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label">${text('澶嶉�夋')}锛�</label>
-						<div class="control-inline">
-							<#form:checkbox path="testCheckbox" dictType="sys_menu_type" blankOption="true" class="form-control"/>
-						</div>
-					</div>
-				</div>
-			</#form:form>
-			<table id="dataGrid"></table>
-			<div id="dataGridPage"></div>
-		</div>
-	</div>
-</div>
-<% } %>
-<script>
-//# // 鍒濆鍖朌ataGrid瀵硅薄
-$('#dataGrid').dataGrid({
-	searchForm: $("#searchForm"),
-	columnModel: [
-		{header:'${text("鍗曡鏂囨湰")}', name:'testInput', index:'a.test_input', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
-			return '<a href="${ctx}/test/testData/form?id='+row.id+'" class="btnList" data-title="${text("缂栬緫鏁版嵁")}">'+(val||row.id)+'</a>';
-		}, searchoptions: { dataInit: function (element) {
-			$(element).attr('form', 'searchForm').attr('name', 'testInput2');
-		}}},
-		{header:'${text("澶氳鏂囨湰")}', name:'testTextarea', index:'a.test_textarea', width:150, align:"left"},
-		{header:'${text("涓嬫媺妗�")}', name:'testSelect', index:'a.test_select', width:150, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_menu_type')}", val, '${text("鏈煡")}', true);
-		}},
-		{header:'${text("涓嬫媺澶氶��")}', name:'testSelectMultiple', index:'a.test_select_multiple', width:150, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_menu_type')}", val, '${text("鏈煡")}', true);
-		}},
-		{header:'${text("鍗曢�夋")}', name:'testRadio', index:'a.test_radio', width:150, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_menu_type')}", val, '${text("鏈煡")}', true);
-		}},
-		{header:'${text("澶嶉�夋")}', name:'testCheckbox', index:'a.test_checkbox', width:150, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_menu_type')}", val, '${text("鏈煡")}', true);
-		}},
-		{header:'${text("鏃ユ湡閫夋嫨")}', name:'testDate', index:'a.test_date', width:150, align:"center"},
-		{header:'${text("鏃ユ湡鏃堕棿")}', name:'testDatetime', index:'a.test_datetime', width:150, align:"center"},
-		{header:'${text("鐢ㄦ埛閫夋嫨")}', name:'testUser.userName', index:'a.test_user_code', width:150, align:"center"},
-		{header:'${text("鏈烘瀯閫夋嫨")}', name:'testOffice.officeName', index:'a.test_office_code', width:150, align:"center"},
-		{header:'${text("鍖哄煙閫夋嫨")}', name:'testAreaName', index:'a.test_area_code', width:150, align:"center"},
-		{header:'${text("鍖哄煙鍚嶇О")}', name:'testAreaName', index:'a.test_area_name', width:150, align:"left"},
-		{header:'${text("鐘舵��")}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_search_status')}", val, '${text("鏈煡")}', true);
-		}},
-		{header:'${text("鍒涘缓鏃堕棿")}', name:'createDate', index:'a.create_date', firstsortorder:'desc', width:150, align:"center"},
-		{header:'${text("澶囨敞")}', name:'remarks', index:'a.remarks', width:150, align:"left"},
-		{header:'${text("鎿嶄綔")}', name:'actions', width:100, formatter: function(val, obj, row, act){
-			var actions = [];
-			//# if(hasPermi('test:testData:edit')){
-				actions.push('<a href="${ctx}/test/testData/form?id='+row.id+'" class="btnList" title="${text("缂栬緫鏁版嵁")}"><i class="fa fa-pencil"></i></a>&nbsp;');
-				if (row.status == Global.STATUS_NORMAL){
-					actions.push('<a href="${ctx}/test/testData/disable?id='+row.id+'" class="btnList" title="${text("鍋滅敤鏁版嵁")}" data-confirm="${text("纭瑕佸仠鐢ㄨ鏁版嵁鍚楋紵")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
-				} else if (row.status == Global.STATUS_DISABLE){
-					actions.push('<a href="${ctx}/test/testData/enable?id='+row.id+'" class="btnList" title="${text("鍚敤鏁版嵁")}" data-confirm="${text("纭瑕佸惎鐢ㄨ鏁版嵁鍚楋紵")}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
-				}
-				actions.push('<a href="${ctx}/test/testData/delete?id='+row.id+'" class="btnList" title="${text("鍒犻櫎鏁版嵁")}" data-confirm="${text("纭瑕佸垹闄よ鏁版嵁鍚楋紵")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			//# }
-			return actions.join('');
-		}}
-	],
-	// 鍙屽嚮琛ㄦ牸琛屾椂璋冪敤
-	ondblClickRow: function(id, rownum, colnum, event){
-		js.addTabPage(null, '缂栬緫鏁版嵁', '${ctx}/test/testData/form?id='+id);
-	},
-	
-	// 瀛愯〃鏍兼敮鎸佹紨绀�
-	subGrid: true,
-	subGridRowExpanded: function (subgridId, rowId) {
-		$('#'+subgridId).html('<h5><i class="icon-docs"></i> 瀛愯〃鏁版嵁</h5>'
-				+'<table id="'+subgridId+'_subgrid"></table>');
-		$('#'+subgridId+'_subgrid').dataGrid({
-			url: '${ctx}/test/testData/subListData',
-			postData: {'testData.id': rowId},
-			autoGridHeight: function(){return 'auto'}, // 璁剧疆鑷姩楂樺害
-			autoGridWidth:  function(){return $("#"+subgridId).width()}, // 璁剧疆鑷姩楂樺害
-			// 璁剧疆鏁版嵁琛ㄦ牸鍒�
-			columnModel: [
-				{header:'${text("鍗曡鏂囨湰")}', name:'testInput', width:150},
-				{header:'${text("澶氳鏂囨湰")}', name:'testTextarea', width:150},
-				{header:'${text("涓嬫媺妗�")}', name:'testSelect', width:150, align:"center", formatter: function(val, obj, row, act){
-					return js.getDictLabel("#{@DictUtils.getDictListJson('sys_menu_type')}", val, '${text("鏈煡")}', true);
-				}},
-				{header:'${text("涓嬫媺澶氶��")}', name:'testSelectMultiple', width:150, align:"center", formatter: function(val, obj, row, act){
-					return js.getDictLabel("#{@DictUtils.getDictListJson('sys_menu_type')}", val, '${text("鏈煡")}', true);
-				}},
-				{header:'${text("鍗曢�夋")}', name:'testRadio', width:150, align:"center", formatter: function(val, obj, row, act){
-					return js.getDictLabel("#{@DictUtils.getDictListJson('sys_menu_type')}", val, '${text("鏈煡")}', true);
-				}},
-				{header:'${text("澶嶉�夋")}', name:'testCheckbox', width:150, align:"center", formatter: function(val, obj, row, act){
-					return js.getDictLabel("#{@DictUtils.getDictListJson('sys_menu_type')}", val, '${text("鏈煡")}', true);
-				}},
-				{header:'${text("鏃ユ湡鏃堕棿")}', name:'testDatetime', width:150, align:"center"},
-				{header:'${text("鐢ㄦ埛鍚嶇О")}', name:'testUser.userName', sortable:false, width:150, align:"center"},
-				{header:'${text("鏈烘瀯鍚嶇О")}', name:'testOffice.officeName', sortable:false, width:150, align:"center"},
-				{header:'${text("鍖哄煙鍚嶇О")}', name:'testAreaName', width:150, align:"center"}
-			],
-			emptyDataHint: true, 	// 琛ㄦ牸鍐呮病鏈夋暟鎹殑鏃跺�欐彁绀� 鈥滄棤鏁版嵁鏄剧ず鈥� v4.1.7
-			//# // 鍔犺浇鎴愬姛鍚庢墽琛屼簨浠�
-			ajaxSuccess: function(data){
-				$(window).resize();
-			}
-		});
-	},
-
-	multiSort: true,		// 鏄惁鏀寔澶氬垪鎺掑簭锛岀粰鍒楁寚瀹� firstsortorder 鍙瀹氬垵娆℃帓搴忔柟寮�
-	emptyDataHint: true, 	// 琛ㄦ牸鍐呮病鏈夋暟鎹殑鏃跺�欐彁绀� 鈥滄棤鏁版嵁鏄剧ず鈥� v4.1.7
-	
-	//# // 鍔犺浇鎴愬姛鍚庢墽琛屼簨浠�
-	ajaxSuccess: function(data){
-//		// 鏃犳暟鎹樉绀猴紝v4.1.7 涔嬪墠鐗堟湰
-// 		if (data.count == 0){
-//			$("#dataGrid").parent().append("<div class=\"ml10\">娌℃湁绗﹀悎鏁版嵁</div>");
-//		}
-//		// 鍒嗛〉鎺т欢鍚庨潰杩藉姞闄勫姞淇℃伅瀹炰緥
-// 		$('#dataGridPage ul:last').after('<ul class="pagination"><li class="disabled controls">鍒嗛〉闄勫姞淇℃伅</li></ul>');
-// 		// 鏍规嵁鏁版嵁鐘舵�侊紝楂樹寒琛岋紝鍙樿壊琛岋紝鐫�鑹茶
-// 		$.each(data.list, function(k, v){
-// 			if (v.status == Global.STATUS_DISABLE){
-// 				$('#'+v.id+' td').css('background', '#e4fda8');
-// 			}
-// 		});
-	}
-})
-// 寮�鍚〃澶翠笅鏀炬悳绱㈠伐鍏锋潯
-//.jqGrid('filterToolbar')
-// 鍒楄〃璁剧疆鏄剧ず闅愯棌鎴栨帓搴忓悗鐨勪簨浠讹紙鍙敤浜庤缃寔涔呭寲锛�
-.on('jqGridRemapColumns',function(){
-	log($('#dataGrid').dataGrid('getParam', 'columnModel'));
-});
-$("#btnTrunsTest").click(function(){ 
-	js.ajaxSubmit("${ctx}/test/testData/transTest", function(data){
-		js.showMessage(data.message);
-		page();
-	});
-	return false;
-});
-</script>
\ No newline at end of file
diff --git a/web/db/h2/test.sql b/web/db/h2/test.sql
deleted file mode 100644
index 11cf00cd..00000000
--- a/web/db/h2/test.sql
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL,
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date datetime,
-	test_datetime datetime,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date datetime NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date datetime NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL,
-	test_sort int,
-	test_data_id varchar(64),
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date datetime,
-	test_datetime datetime,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	tree_name varchar(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date datetime NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date datetime NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (tree_code)
-);
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '娴嬭瘯鏁版嵁';
-COMMENT ON COLUMN test_data.id IS '缂栧彿';
-COMMENT ON COLUMN test_data.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON COLUMN test_data.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_data.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_data.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_data.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_data.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_data.remarks IS '澶囨敞淇℃伅';
-COMMENT ON TABLE test_data_child IS '娴嬭瘯鏁版嵁瀛愯〃';
-COMMENT ON COLUMN test_data_child.id IS '缂栧彿';
-COMMENT ON COLUMN test_data_child.test_sort IS '鎺掑簭鍙�';
-COMMENT ON COLUMN test_data_child.test_data_id IS '鐖惰〃涓婚敭';
-COMMENT ON COLUMN test_data_child.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data_child.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data_child.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data_child.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON TABLE test_tree IS '娴嬭瘯鏍戣〃';
-COMMENT ON COLUMN test_tree.tree_code IS '鑺傜偣缂栫爜';
-COMMENT ON COLUMN test_tree.parent_code IS '鐖剁骇缂栧彿';
-COMMENT ON COLUMN test_tree.parent_codes IS '鎵�鏈夌埗绾х紪鍙�';
-COMMENT ON COLUMN test_tree.tree_sort IS '鎺掑簭鍙凤紙鍗囧簭锛�';
-COMMENT ON COLUMN test_tree.tree_sorts IS '鎵�鏈夋帓搴忓彿';
-COMMENT ON COLUMN test_tree.tree_leaf IS '鏄惁鏈�鏈骇';
-COMMENT ON COLUMN test_tree.tree_level IS '灞傛绾у埆';
-COMMENT ON COLUMN test_tree.tree_names IS '鍏ㄨ妭鐐瑰悕';
-COMMENT ON COLUMN test_tree.tree_name IS '鑺傜偣鍚嶇О';
-COMMENT ON COLUMN test_tree.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_tree.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_tree.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_tree.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_tree.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_tree.remarks IS '澶囨敞淇℃伅';
-
-
-
diff --git a/web/db/mssql/test.sql b/web/db/mssql/test.sql
deleted file mode 100644
index 4ae8a769..00000000
--- a/web/db/mssql/test.sql
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE [test_data]
-(
-	[id] varchar(64) NOT NULL,
-	[test_input] varchar(200),
-	[test_textarea] nvarchar(200),
-	[test_select] varchar(10),
-	[test_select_multiple] varchar(200),
-	[test_radio] varchar(10),
-	[test_checkbox] varchar(200),
-	[test_date] datetime,
-	[test_datetime] datetime,
-	[test_user_code] varchar(64),
-	[test_office_code] varchar(64),
-	[test_area_code] varchar(64),
-	[test_area_name] nvarchar(100),
-	[status] char(1) DEFAULT '0' NOT NULL,
-	[create_by] varchar(64) NOT NULL,
-	[create_date] datetime NOT NULL,
-	[update_by] varchar(64) NOT NULL,
-	[update_date] datetime NOT NULL,
-	[remarks] nvarchar(500),
-	PRIMARY KEY ([id])
-);
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE [test_data_child]
-(
-	[id] varchar(64) NOT NULL,
-	[test_sort] int,
-	[test_data_id] varchar(64),
-	[test_input] varchar(200),
-	[test_textarea] nvarchar(200),
-	[test_select] varchar(10),
-	[test_select_multiple] varchar(200),
-	[test_radio] varchar(10),
-	[test_checkbox] varchar(200),
-	[test_date] datetime,
-	[test_datetime] datetime,
-	[test_user_code] varchar(64),
-	[test_office_code] varchar(64),
-	[test_area_code] varchar(64),
-	[test_area_name] nvarchar(100),
-	PRIMARY KEY ([id])
-);
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE [test_tree]
-(
-	[tree_code] varchar(64) NOT NULL,
-	[parent_code] varchar(64) NOT NULL,
-	[parent_codes] varchar(767) NOT NULL,
-	[tree_sort] decimal(10) NOT NULL,
-	[tree_sorts] varchar(767) NOT NULL,
-	[tree_leaf] char(1) NOT NULL,
-	[tree_level] decimal(4) NOT NULL,
-	[tree_names] varchar(767) NOT NULL,
-	[tree_name] nvarchar(200) NOT NULL,
-	[status] char(1) DEFAULT '0' NOT NULL,
-	[create_by] varchar(64) NOT NULL,
-	[create_date] datetime NOT NULL,
-	[update_by] varchar(64) NOT NULL,
-	[update_date] datetime NOT NULL,
-	[remarks] nvarchar(500),
-	PRIMARY KEY ([tree_code])
-);
-
-
-
diff --git a/web/db/mysql/create_user.sql b/web/db/mysql/create_user.sql
deleted file mode 100644
index 7876ee92..00000000
--- a/web/db/mysql/create_user.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-
--- 鎵撳紑 my.ini 缁� [mysqld] 澧炲姞濡備笅閰嶇疆锛�
--- sql_mode=ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
-
-set global read_only=0;
-
-create user 'jeesite'@'%' identified by 'jeesite';
-
-create database jeesite DEFAULT CHARSET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci';
-
-grant all privileges on jeesite.* to 'jeesite'@'%' identified by 'jeesite';
-
-flush privileges;
diff --git a/web/db/mysql/test.sql b/web/db/mysql/test.sql
deleted file mode 100644
index 06c78075..00000000
--- a/web/db/mysql/test.sql
+++ /dev/null
@@ -1,76 +0,0 @@
-SET SESSION FOREIGN_KEY_CHECKS=0;
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL COMMENT '缂栧彿',
-	test_input varchar(200) COMMENT '鍗曡鏂囨湰',
-	test_textarea varchar(200) COMMENT '澶氳鏂囨湰',
-	test_select varchar(10) COMMENT '涓嬫媺妗�',
-	test_select_multiple varchar(200) COMMENT '涓嬫媺澶氶��',
-	test_radio varchar(10) COMMENT '鍗曢�夋',
-	test_checkbox varchar(200) COMMENT '澶嶉�夋',
-	test_date datetime COMMENT '鏃ユ湡閫夋嫨',
-	test_datetime datetime COMMENT '鏃ユ湡鏃堕棿',
-	test_user_code varchar(64) COMMENT '鐢ㄦ埛閫夋嫨',
-	test_office_code varchar(64) COMMENT '鏈烘瀯閫夋嫨',
-	test_area_code varchar(64) COMMENT '鍖哄煙閫夋嫨',
-	test_area_name varchar(100) COMMENT '鍖哄煙鍚嶇О',
-	status char(1) DEFAULT '0' NOT NULL COMMENT '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�',
-	create_by varchar(64) NOT NULL COMMENT '鍒涘缓鑰�',
-	create_date datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
-	update_by varchar(64) NOT NULL COMMENT '鏇存柊鑰�',
-	update_date datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
-	remarks varchar(500) COMMENT '澶囨敞淇℃伅',
-	PRIMARY KEY (id)
-) COMMENT = '娴嬭瘯鏁版嵁';
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL COMMENT '缂栧彿',
-	test_sort int COMMENT '鎺掑簭鍙�',
-	test_data_id varchar(64) COMMENT '鐖惰〃涓婚敭',
-	test_input varchar(200) COMMENT '鍗曡鏂囨湰',
-	test_textarea varchar(200) COMMENT '澶氳鏂囨湰',
-	test_select varchar(10) COMMENT '涓嬫媺妗�',
-	test_select_multiple varchar(200) COMMENT '涓嬫媺澶氶��',
-	test_radio varchar(10) COMMENT '鍗曢�夋',
-	test_checkbox varchar(200) COMMENT '澶嶉�夋',
-	test_date datetime COMMENT '鏃ユ湡閫夋嫨',
-	test_datetime datetime COMMENT '鏃ユ湡鏃堕棿',
-	test_user_code varchar(64) COMMENT '鐢ㄦ埛閫夋嫨',
-	test_office_code varchar(64) COMMENT '鏈烘瀯閫夋嫨',
-	test_area_code varchar(64) COMMENT '鍖哄煙閫夋嫨',
-	test_area_name varchar(100) COMMENT '鍖哄煙鍚嶇О',
-	PRIMARY KEY (id)
-) COMMENT = '娴嬭瘯鏁版嵁瀛愯〃';
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL COMMENT '鑺傜偣缂栫爜',
-	parent_code varchar(64) NOT NULL COMMENT '鐖剁骇缂栧彿',
-	parent_codes varchar(767) NOT NULL COMMENT '鎵�鏈夌埗绾х紪鍙�',
-	tree_sort decimal(10) NOT NULL COMMENT '鎺掑簭鍙凤紙鍗囧簭锛�',
-	tree_sorts varchar(767) NOT NULL COMMENT '鎵�鏈夋帓搴忓彿',
-	tree_leaf char(1) NOT NULL COMMENT '鏄惁鏈�鏈骇',
-	tree_level decimal(4) NOT NULL COMMENT '灞傛绾у埆',
-	tree_names varchar(767) NOT NULL COMMENT '鍏ㄨ妭鐐瑰悕',
-	tree_name varchar(200) NOT NULL COMMENT '鑺傜偣鍚嶇О',
-	status char(1) DEFAULT '0' NOT NULL COMMENT '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�',
-	create_by varchar(64) NOT NULL COMMENT '鍒涘缓鑰�',
-	create_date datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
-	update_by varchar(64) NOT NULL COMMENT '鏇存柊鑰�',
-	update_date datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
-	remarks varchar(500) COMMENT '澶囨敞淇℃伅',
-	PRIMARY KEY (tree_code)
-) COMMENT = '娴嬭瘯鏍戣〃';
-
-
-
diff --git a/web/db/oracle/create_user.sql b/web/db/oracle/create_user.sql
deleted file mode 100644
index 7ccd2411..00000000
--- a/web/db/oracle/create_user.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-
-create user jeesite
-	identified by jeesite
-	quota unlimited on users;
-  
-grant connect,resource,create session,select any table,
-		create any view,create any table,create any index,
-		drop any table,drop any view,drop any index
-	to jeesite;
-	
--- 鎻愮ず oracle.jdbc.xa.OracleXAResource.recover 閿欒闇�瑕佹巿鏉冿細
-grant select on sys.dba_pending_transactions to jeesite;
-grant select on sys.pending_trans$ to jeesite;
-grant select on sys.dba_2pc_pending to jeesite;
-grant execute on sys.dbms_system to jeesite;
diff --git a/web/db/oracle/test.sql b/web/db/oracle/test.sql
deleted file mode 100644
index 4308d8d3..00000000
--- a/web/db/oracle/test.sql
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar2(64) NOT NULL,
-	test_input varchar2(200),
-	test_textarea nvarchar2(200),
-	test_select varchar2(10),
-	test_select_multiple varchar2(200),
-	test_radio varchar2(10),
-	test_checkbox varchar2(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar2(64),
-	test_office_code varchar2(64),
-	test_area_code varchar2(64),
-	test_area_name nvarchar2(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar2(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar2(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks nvarchar2(500),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar2(64) NOT NULL,
-	test_sort number(10,0),
-	test_data_id varchar2(64),
-	test_input varchar2(200),
-	test_textarea nvarchar2(200),
-	test_select varchar2(10),
-	test_select_multiple varchar2(200),
-	test_radio varchar2(10),
-	test_checkbox varchar2(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar2(64),
-	test_office_code varchar2(64),
-	test_area_code varchar2(64),
-	test_area_name nvarchar2(100),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar2(64) NOT NULL,
-	parent_code varchar2(64) NOT NULL,
-	parent_codes varchar2(767) NOT NULL,
-	tree_sort number(10) NOT NULL,
-	tree_sorts varchar2(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level number(4) NOT NULL,
-	tree_names varchar2(767) NOT NULL,
-	tree_name nvarchar2(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar2(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar2(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks nvarchar2(500),
-	PRIMARY KEY (tree_code)
-);
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '娴嬭瘯鏁版嵁';
-COMMENT ON COLUMN test_data.id IS '缂栧彿';
-COMMENT ON COLUMN test_data.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON COLUMN test_data.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_data.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_data.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_data.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_data.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_data.remarks IS '澶囨敞淇℃伅';
-COMMENT ON TABLE test_data_child IS '娴嬭瘯鏁版嵁瀛愯〃';
-COMMENT ON COLUMN test_data_child.id IS '缂栧彿';
-COMMENT ON COLUMN test_data_child.test_sort IS '鎺掑簭鍙�';
-COMMENT ON COLUMN test_data_child.test_data_id IS '鐖惰〃涓婚敭';
-COMMENT ON COLUMN test_data_child.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data_child.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data_child.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data_child.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON TABLE test_tree IS '娴嬭瘯鏍戣〃';
-COMMENT ON COLUMN test_tree.tree_code IS '鑺傜偣缂栫爜';
-COMMENT ON COLUMN test_tree.parent_code IS '鐖剁骇缂栧彿';
-COMMENT ON COLUMN test_tree.parent_codes IS '鎵�鏈夌埗绾х紪鍙�';
-COMMENT ON COLUMN test_tree.tree_sort IS '鎺掑簭鍙凤紙鍗囧簭锛�';
-COMMENT ON COLUMN test_tree.tree_sorts IS '鎵�鏈夋帓搴忓彿';
-COMMENT ON COLUMN test_tree.tree_leaf IS '鏄惁鏈�鏈骇';
-COMMENT ON COLUMN test_tree.tree_level IS '灞傛绾у埆';
-COMMENT ON COLUMN test_tree.tree_names IS '鍏ㄨ妭鐐瑰悕';
-COMMENT ON COLUMN test_tree.tree_name IS '鑺傜偣鍚嶇О';
-COMMENT ON COLUMN test_tree.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_tree.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_tree.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_tree.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_tree.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_tree.remarks IS '澶囨敞淇℃伅';
-
-
-
diff --git a/web/db/postgresql/test.sql b/web/db/postgresql/test.sql
deleted file mode 100644
index 54758d68..00000000
--- a/web/db/postgresql/test.sql
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL,
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (id)
-) WITHOUT OIDS;
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL,
-	test_sort int,
-	test_data_id varchar(64),
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	PRIMARY KEY (id)
-) WITHOUT OIDS;
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	tree_name varchar(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (tree_code)
-) WITHOUT OIDS;
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '娴嬭瘯鏁版嵁';
-COMMENT ON COLUMN test_data.id IS '缂栧彿';
-COMMENT ON COLUMN test_data.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON COLUMN test_data.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_data.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_data.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_data.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_data.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_data.remarks IS '澶囨敞淇℃伅';
-COMMENT ON TABLE test_data_child IS '娴嬭瘯鏁版嵁瀛愯〃';
-COMMENT ON COLUMN test_data_child.id IS '缂栧彿';
-COMMENT ON COLUMN test_data_child.test_sort IS '鎺掑簭鍙�';
-COMMENT ON COLUMN test_data_child.test_data_id IS '鐖惰〃涓婚敭';
-COMMENT ON COLUMN test_data_child.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data_child.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data_child.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data_child.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON TABLE test_tree IS '娴嬭瘯鏍戣〃';
-COMMENT ON COLUMN test_tree.tree_code IS '鑺傜偣缂栫爜';
-COMMENT ON COLUMN test_tree.parent_code IS '鐖剁骇缂栧彿';
-COMMENT ON COLUMN test_tree.parent_codes IS '鎵�鏈夌埗绾х紪鍙�';
-COMMENT ON COLUMN test_tree.tree_sort IS '鎺掑簭鍙凤紙鍗囧簭锛�';
-COMMENT ON COLUMN test_tree.tree_sorts IS '鎵�鏈夋帓搴忓彿';
-COMMENT ON COLUMN test_tree.tree_leaf IS '鏄惁鏈�鏈骇';
-COMMENT ON COLUMN test_tree.tree_level IS '灞傛绾у埆';
-COMMENT ON COLUMN test_tree.tree_names IS '鍏ㄨ妭鐐瑰悕';
-COMMENT ON COLUMN test_tree.tree_name IS '鑺傜偣鍚嶇О';
-COMMENT ON COLUMN test_tree.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_tree.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_tree.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_tree.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_tree.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_tree.remarks IS '澶囨敞淇℃伅';
-
-
-
diff --git a/web/db/test.erm b/web/db/test.erm
deleted file mode 100644
index 9354e409..00000000
--- a/web/db/test.erm
+++ /dev/null
@@ -1,3590 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<diagram>
-	<page_setting>
-		<direction_horizontal>true</direction_horizontal>
-		<scale>100</scale>
-		<paper_size>A4 210 x 297 mm</paper_size>
-		<top_margin>30</top_margin>
-		<left_margin>30</left_margin>
-		<bottom_margin>30</bottom_margin>
-		<right_margin>30</right_margin>
-	</page_setting>
-	<category_index>0</category_index>
-	<zoom>1.0</zoom>
-	<x>0</x>
-	<y>0</y>
-	<default_color>
-		<r>128</r>
-		<g>128</g>
-		<b>192</b>
-	</default_color>
-	<color>
-		<r>255</r>
-		<g>255</g>
-		<b>255</b>
-	</color>
-	<font_name>Arial</font_name>
-	<font_size>14</font_size>
-	<settings>
-		<database>StandardSQL</database>
-		<capital>false</capital>
-		<table_style></table_style>
-		<notation></notation>
-		<notation_level>0</notation_level>
-		<notation_expand_group>true</notation_expand_group>
-		<view_mode>2</view_mode>
-		<outline_view_mode>1</outline_view_mode>
-		<view_order_by>1</view_order_by>
-		<auto_ime_change>false</auto_ime_change>
-		<validate_physical_name>true</validate_physical_name>
-		<use_bezier_curve>false</use_bezier_curve>
-		<suspend_validator>false</suspend_validator>
-		<export_setting>
-			<export_ddl_setting>
-				<output_path>db/test.sql</output_path>
-				<encoding>UTF-8</encoding>
-				<line_feed>CR+LF</line_feed>
-				<is_open_after_saved>false</is_open_after_saved>
-				<environment_id>7be191506f9daa8070b3ac14921dffd44063d2bb</environment_id>
-				<category_id>null</category_id>
-				<ddl_target>
-					<create_comment>true</create_comment>
-					<create_foreignKey>false</create_foreignKey>
-					<create_index>true</create_index>
-					<create_sequence>false</create_sequence>
-					<create_table>true</create_table>
-					<create_tablespace>false</create_tablespace>
-					<create_trigger>false</create_trigger>
-					<create_view>false</create_view>
-					<drop_index>false</drop_index>
-					<drop_sequence>false</drop_sequence>
-					<drop_table>false</drop_table>
-					<drop_tablespace>false</drop_tablespace>
-					<drop_trigger>false</drop_trigger>
-					<drop_view>false</drop_view>
-					<inline_column_comment>false</inline_column_comment>
-					<inline_table_comment>true</inline_table_comment>
-					<comment_value_description>false</comment_value_description>
-					<comment_value_logical_name>true</comment_value_logical_name>
-					<comment_value_logical_name_description>false</comment_value_logical_name_description>
-					<comment_replace_line_feed>false</comment_replace_line_feed>
-					<comment_replace_string></comment_replace_string>
-				</ddl_target>
-			</export_ddl_setting>
-			<export_excel_setting>
-				<category_id>null</category_id>
-				<output_path>db/test.xls</output_path>
-				<template></template>
-				<template_path></template_path>
-				<used_default_template_lang>en</used_default_template_lang>
-				<image_output></image_output>
-				<is_open_after_saved>true</is_open_after_saved>
-				<is_put_diagram>true</is_put_diagram>
-				<is_use_logical_name>true</is_use_logical_name>
-			</export_excel_setting>
-			<export_html_setting>
-				<output_dir></output_dir>
-				<with_category_image>true</with_category_image>
-				<with_image>true</with_image>
-				<is_open_after_saved>true</is_open_after_saved>
-			</export_html_setting>
-			<export_image_setting>
-				<output_file_path>db/test.png</output_file_path>
-				<category_dir_path></category_dir_path>
-				<with_category_image>true</with_category_image>
-				<is_open_after_saved>true</is_open_after_saved>
-			</export_image_setting>
-			<export_java_setting>
-				<java_output></java_output>
-				<package_name></package_name>
-				<class_name_suffix></class_name_suffix>
-				<src_file_encoding></src_file_encoding>
-				<with_hibernate>false</with_hibernate>
-			</export_java_setting>
-			<export_testdata_setting>
-				<file_encoding></file_encoding>
-				<file_path></file_path>
-				<format>0</format>
-			</export_testdata_setting>
-		</export_setting>
-		<category_settings>
-			<free_layout>false</free_layout>
-			<show_referred_tables>false</show_referred_tables>
-			<categories>
-			</categories>
-		</category_settings>
-		<translation_settings>
-			<use>false</use>
-			<translations>
-			</translations>
-		</translation_settings>
-		<model_properties>
-			<id></id>
-			<height>-1</height>
-			<width>-1</width>
-				<font_name>Arial</font_name>
-				<font_size>14</font_size>
-			<x>50</x>
-			<y>50</y>
-			<color>
-				<r>255</r>
-				<g>255</g>
-				<b>255</b>
-			</color>
-			<connections>
-			</connections>
-			<display>false</display>
-			<creation_date>2016-12-25 17:25:00</creation_date>
-			<model_property>
-				<name>Project Name</name>
-				<value></value>
-			</model_property>
-			<model_property>
-				<name>Model Name</name>
-				<value></value>
-			</model_property>
-			<model_property>
-				<name>Version</name>
-				<value></value>
-			</model_property>
-			<model_property>
-				<name>Company</name>
-				<value></value>
-			</model_property>
-			<model_property>
-				<name>Author</name>
-				<value></value>
-			</model_property>
-		</model_properties>
-		<table_properties>
-			<schema></schema>
-		</table_properties>
-		<environment_setting>
-			<environment>
-				<id>7be191506f9daa8070b3ac14921dffd44063d2bb</id>
-				<name>Default</name>
-			</environment>
-		</environment_setting>
-	</settings>
-	<dictionary>
-		<word>
-			<id>c71533e4d2f429ff8466fd6a8de5719f1741377b</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description>绉熸埛浠ｇ爜</description>
-			<logical_name>绉熸埛浠ｇ爜</logical_name>
-			<physical_name>corp_code</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>11c59294fe142d108ca4dac5a03033f50188a450</id>
-			<length>100</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description>绉熸埛鍚嶇О</description>
-			<logical_name>绉熸埛鍚嶇О</logical_name>
-			<physical_name>corp_name</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>f60ca81cf3f5c08c518d0266d2b8fd1b219a9802</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鍒涘缓鑰�</logical_name>
-			<physical_name>create_by</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>170410257b4d8e712b8c1d499b415de82ce9683c</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鍒涘缓鏃堕棿</logical_name>
-			<physical_name>create_date</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>038ea74a700b763fa1f8fcdbd2c27e7941f82f7a</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Date 1</logical_name>
-			<physical_name>extend_d1</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>19aa2e40abff2bb4e908f18f5f5e5b30a074cd8b</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Date 2</logical_name>
-			<physical_name>extend_d2</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>06f59428b50e62e636a58a2f3cbcee2c75764506</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Date 3</logical_name>
-			<physical_name>extend_d3</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>8f08aeb4b9ceb072f0232d3d23fd5371ef8f379c</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Date 4</logical_name>
-			<physical_name>extend_d4</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>0733a829c52af8af725ace50d4ed3e0179969f56</id>
-			<length>19</length>
-			<decimal>4</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Float 1</logical_name>
-			<physical_name>extend_f1</physical_name>
-			<type>decimal(p,s)</type>
-		</word>
-		<word>
-			<id>0b7230df29d6df213507c8855d019d2d55c9a561</id>
-			<length>19</length>
-			<decimal>4</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Float 2</logical_name>
-			<physical_name>extend_f2</physical_name>
-			<type>decimal(p,s)</type>
-		</word>
-		<word>
-			<id>6cb3dad83f3e1f358155892dcee3167ef55bacc7</id>
-			<length>19</length>
-			<decimal>4</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Float 3</logical_name>
-			<physical_name>extend_f3</physical_name>
-			<type>decimal(p,s)</type>
-		</word>
-		<word>
-			<id>e54b261fc7ab81e0ef19a89e657453664abe5593</id>
-			<length>19</length>
-			<decimal>4</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Float 4</logical_name>
-			<physical_name>extend_f4</physical_name>
-			<type>decimal(p,s)</type>
-		</word>
-		<word>
-			<id>b67071354a8d43cabe9a0ac29303f8b144a15985</id>
-			<length>19</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Integer 1</logical_name>
-			<physical_name>extend_i1</physical_name>
-			<type>decimal(p)</type>
-		</word>
-		<word>
-			<id>70b8240f049f658b97394b7d4784481fdb477f5c</id>
-			<length>19</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Integer 2</logical_name>
-			<physical_name>extend_i2</physical_name>
-			<type>decimal(p)</type>
-		</word>
-		<word>
-			<id>ce377c081415847061b2efc58b701ff847dcaaca</id>
-			<length>19</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Integer 3</logical_name>
-			<physical_name>extend_i3</physical_name>
-			<type>decimal(p)</type>
-		</word>
-		<word>
-			<id>fb96f6dc60d31576c278a3c64024154eda67d3fe</id>
-			<length>19</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 Integer 4</logical_name>
-			<physical_name>extend_i4</physical_name>
-			<type>decimal(p)</type>
-		</word>
-		<word>
-			<id>3962f4b130a803841a193a163e42679946b5ae1f</id>
-			<length>1000</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 JSON</logical_name>
-			<physical_name>extend_json</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>b1acb2df17677e0ed818dea6e1150bfc088fcd50</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 1</logical_name>
-			<physical_name>extend_s1</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>d27290b84b207a7c87f4d78d80e62048c67fac04</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 2</logical_name>
-			<physical_name>extend_s2</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>5e25d7f0e327d2d760a04b32140b639bb96bfd8d</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 3</logical_name>
-			<physical_name>extend_s3</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>d05572af90653d4ddfd880402a15ed9b27c81888</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 4</logical_name>
-			<physical_name>extend_s4</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>acc372d31709a1133f6c13fc8abfef7881ca26ed</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 5</logical_name>
-			<physical_name>extend_s5</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>59763a16504e4136a7a2fbed38476272d337105c</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 6</logical_name>
-			<physical_name>extend_s6</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>600b96b04bf4f65919eabfc6613d3c5e370931e1</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 7</logical_name>
-			<physical_name>extend_s7</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>a9dc80e5c484dc7b9d5fff9294eaa383819edc26</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵╁睍 String 8</logical_name>
-			<physical_name>extend_s8</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>e3325b6b7dc29b87da73eedcfff2a9c4cd245579</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>缂栧彿</logical_name>
-			<physical_name>id</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>e4465172e2cc64907a386237cc7d0c7d79a074dc</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鐖剁骇缂栧彿</logical_name>
-			<physical_name>parent_code</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>b4f9837136b0a84afc9a611a563fb51141fdac1f</id>
-			<length>767</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵�鏈夌埗绾х紪鍙�</logical_name>
-			<physical_name>parent_codes</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>1a77879eeba6dd8a2ca8de0ca0cbd6db5ddeb7af</id>
-			<length>500</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>澶囨敞淇℃伅</logical_name>
-			<physical_name>remarks</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>a5d0a391d0d09acab89c829d271b0a96a7058ca0</id>
-			<length>1</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤 3鍐荤粨 4瀹℃牳 5椹冲洖 9鑽夌ǹ锛�</logical_name>
-			<physical_name>status</physical_name>
-			<type>character(n)</type>
-		</word>
-		<word>
-			<id>70d065a29d01e3875167a20441e0ebbfaf5a05f8</id>
-			<length>1</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�</logical_name>
-			<physical_name>status</physical_name>
-			<type>character(n)</type>
-		</word>
-		<word>
-			<id>5f188d6afcf9d1afbbe94ac6d92f800caef67cbe</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鍖哄煙閫夋嫨</logical_name>
-			<physical_name>test_area_code</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>6adbc087f6a7805c1d979bee36098c497d399378</id>
-			<length>100</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鍖哄煙鍚嶇О</logical_name>
-			<physical_name>test_area_name</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>5cab10f2b339972b1f10cb150baf883a8adffdbb</id>
-			<length>200</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>澶嶉�夋</logical_name>
-			<physical_name>test_checkbox</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>80c7c6394e75c6f7acbf75bae587afdc02d3990b</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鐖惰〃涓婚敭</logical_name>
-			<physical_name>test_data_id</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>7b4cc71483ef98673d4cc313eb99314e27722e28</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鏃ユ湡閫夋嫨</logical_name>
-			<physical_name>test_date</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>bc2e5b104e72723c9c6710c9a3a02804111b6846</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鏃ユ湡鏃堕棿</logical_name>
-			<physical_name>test_datetime</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>89d26a106a3b0895ebfe6ccf9b5930ef4b1612c1</id>
-			<length>200</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鍗曡鏂囨湰</logical_name>
-			<physical_name>test_input</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>efa0f7e9084cf3b09f7e31101ec496a44aadaaa4</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鏈烘瀯閫夋嫨</logical_name>
-			<physical_name>test_office_code</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>7b62803aab5f5a3c3f9ff63f7d5122a9ef3a41bb</id>
-			<length>10</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鍗曢�夋</logical_name>
-			<physical_name>test_radio</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>3a0f10db94ed1cb6e8cb088ca0275b664d4fca4c</id>
-			<length>10</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>涓嬫媺妗�</logical_name>
-			<physical_name>test_select</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>cb6ff93372480fd7d11e66a1e9c9fa028149e99c</id>
-			<length>200</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>涓嬫媺澶氶��</logical_name>
-			<physical_name>test_select_multiple</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>f1929c4074c74e32b7e4ac70c95476add194c0a0</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎺掑簭鍙�</logical_name>
-			<physical_name>test_sort</physical_name>
-			<type>integer</type>
-		</word>
-		<word>
-			<id>c22eb21bd16761440f79d8782099fa4b0e9115cb</id>
-			<length>200</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>澶氳鏂囨湰</logical_name>
-			<physical_name>test_textarea</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>54338e0229264fd01ec1efff7c49b30d966df58e</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鐢ㄦ埛閫夋嫨</logical_name>
-			<physical_name>test_user_code</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>abe7e075aa224d4322d021e5659d170e0a927621</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鑺傜偣缂栫爜</logical_name>
-			<physical_name>tree_code</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>8fb086ad8b2a35cdf18c1a1e247005cdb140faf0</id>
-			<length>1</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鏄惁鏈�鏈骇</logical_name>
-			<physical_name>tree_leaf</physical_name>
-			<type>character(n)</type>
-		</word>
-		<word>
-			<id>f22022df4ccf9c7081b4d8f98deed04c1d8c987c</id>
-			<length>4</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>灞傛绾у埆</logical_name>
-			<physical_name>tree_level</physical_name>
-			<type>decimal(p)</type>
-		</word>
-		<word>
-			<id>b023ebdb5c45aa960edd4a77dbe90dcdcc346664</id>
-			<length>200</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鑺傜偣鍚嶇О</logical_name>
-			<physical_name>tree_name</physical_name>
-			<type>nvarchar(n)</type>
-		</word>
-		<word>
-			<id>44f852382fba107fe668304530dea0233f38a321</id>
-			<length>767</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鍏ㄨ妭鐐瑰悕</logical_name>
-			<physical_name>tree_names</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>65265fefa00907a60e8fe2ebd6d2ad58760415e5</id>
-			<length>10</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎺掑簭鍙凤紙鍗囧簭锛�</logical_name>
-			<physical_name>tree_sort</physical_name>
-			<type>decimal(p)</type>
-		</word>
-		<word>
-			<id>cf5f1e3cc5cc0869f539c3c5b2adf05677e367b8</id>
-			<length>767</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鎵�鏈夋帓搴忓彿</logical_name>
-			<physical_name>tree_sorts</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>c60616703cf07aaf21f84215d092e2101efb9bca</id>
-			<length>64</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鏇存柊鑰�</logical_name>
-			<physical_name>update_by</physical_name>
-			<type>varchar(n)</type>
-		</word>
-		<word>
-			<id>b5c3a59170184a01c15c78a6778cb73083fe6321</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description></description>
-			<logical_name>鏇存柊鏃堕棿</logical_name>
-			<physical_name>update_date</physical_name>
-			<type>datetime</type>
-		</word>
-	</dictionary>
-	<tablespace_set>
-	</tablespace_set>
-	<contents>
-		<table>
-			<id>e553474c37270813e70025e433a4cf8a64653e13</id>
-			<height>438</height>
-			<width>387</width>
-				<font_name>Arial</font_name>
-				<font_size>14</font_size>
-			<x>864</x>
-			<y>36</y>
-			<color>
-				<r>128</r>
-				<g>128</g>
-				<b>192</b>
-			</color>
-			<connections>
-			</connections>
-			<physical_name>test_tree</physical_name>
-			<logical_name>娴嬭瘯鏍戣〃</logical_name>
-			<description></description>
-			<constraint></constraint>
-			<primary_key_name></primary_key_name>
-			<option></option>
-			<columns>
-				<normal_column>
-					<word_id>abe7e075aa224d4322d021e5659d170e0a927621</word_id>
-					<id>7e417ee9d0dd69c767a5853922621946ed4fb2d8</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>true</not_null>
-					<primary_key>true</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<column_group>a535b6c506004a7fdf4d48984c9ff2cfa59c157a</column_group>
-				<normal_column>
-					<word_id>b023ebdb5c45aa960edd4a77dbe90dcdcc346664</word_id>
-					<id>39f501890586173d229e83610cfbfaa6e3a85374</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>nvarchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>true</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<column_group>35ae805d1da92afdb99b2fe8c536d1649356fccd</column_group>
-			</columns>
-			<indexes>
-			</indexes>
-			<complex_unique_key_list>
-			</complex_unique_key_list>
-			<table_properties>
-				<schema></schema>
-			</table_properties>
-		</table>
-		<table>
-			<id>5435ef11ea53f170fe3491b199c113e47932e175</id>
-			<height>401</height>
-			<width>320</width>
-				<font_name>Arial</font_name>
-				<font_size>14</font_size>
-			<x>36</x>
-			<y>36</y>
-			<color>
-				<r>128</r>
-				<g>128</g>
-				<b>192</b>
-			</color>
-			<connections>
-			</connections>
-			<physical_name>test_data</physical_name>
-			<logical_name>娴嬭瘯鏁版嵁</logical_name>
-			<description></description>
-			<constraint></constraint>
-			<primary_key_name></primary_key_name>
-			<option></option>
-			<columns>
-				<normal_column>
-					<word_id>e3325b6b7dc29b87da73eedcfff2a9c4cd245579</word_id>
-					<id>d82778c36626013cd39fd790da6f55a9762f0c76</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>true</not_null>
-					<primary_key>true</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>89d26a106a3b0895ebfe6ccf9b5930ef4b1612c1</word_id>
-					<id>3e14b40dc07c134329a40752973acfad2ffdc48b</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>c22eb21bd16761440f79d8782099fa4b0e9115cb</word_id>
-					<id>8050d948828b16267482e9e3716219321f206b81</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>nvarchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>3a0f10db94ed1cb6e8cb088ca0275b664d4fca4c</word_id>
-					<id>3664605e054c39531ca8e91aa4463c955a993357</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>cb6ff93372480fd7d11e66a1e9c9fa028149e99c</word_id>
-					<id>f7b189ecdc92c78bfaae9c736318ab6a5aedd396</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>7b62803aab5f5a3c3f9ff63f7d5122a9ef3a41bb</word_id>
-					<id>6e4837ab55b592669ccc7ebfc8b1ed96a00607b3</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>5cab10f2b339972b1f10cb150baf883a8adffdbb</word_id>
-					<id>9fb81bdc12ed017f62e9dd4529025e536eff7f08</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>7b4cc71483ef98673d4cc313eb99314e27722e28</word_id>
-					<id>9d9478798ed2766a81b0e5a8a022eb89d9c5cc34</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>datetime</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>bc2e5b104e72723c9c6710c9a3a02804111b6846</word_id>
-					<id>c131dc5cb7ce6f1aa5e8d5f86f2002c8ae1bb8f6</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>datetime</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>54338e0229264fd01ec1efff7c49b30d966df58e</word_id>
-					<id>cfe3c330968a9a824c2cf933b227887d3e9615ac</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>efa0f7e9084cf3b09f7e31101ec496a44aadaaa4</word_id>
-					<id>23041cb30875514136904ea11043c7ea1924f048</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>5f188d6afcf9d1afbbe94ac6d92f800caef67cbe</word_id>
-					<id>b6d5dc8745c0fa484ed6f14e90a42282ca1b285d</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>6adbc087f6a7805c1d979bee36098c497d399378</word_id>
-					<id>d244401ff7302bb5b75092016531952d093b238b</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>nvarchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<column_group>35ae805d1da92afdb99b2fe8c536d1649356fccd</column_group>
-			</columns>
-			<indexes>
-			</indexes>
-			<complex_unique_key_list>
-			</complex_unique_key_list>
-			<table_properties>
-				<schema></schema>
-			</table_properties>
-		</table>
-		<table>
-			<id>5a836e654b7b7d19f102e87336fefa079d98a2e6</id>
-			<height>438</height>
-			<width>346</width>
-				<font_name>Arial</font_name>
-				<font_size>14</font_size>
-			<x>468</x>
-			<y>36</y>
-			<color>
-				<r>128</r>
-				<g>128</g>
-				<b>192</b>
-			</color>
-			<connections>
-			</connections>
-			<physical_name>test_data_child</physical_name>
-			<logical_name>娴嬭瘯鏁版嵁瀛愯〃</logical_name>
-			<description></description>
-			<constraint></constraint>
-			<primary_key_name></primary_key_name>
-			<option></option>
-			<columns>
-				<normal_column>
-					<word_id>e3325b6b7dc29b87da73eedcfff2a9c4cd245579</word_id>
-					<id>34477707bcf8a7810e12e9565aff085f6fb1e0ad</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>true</not_null>
-					<primary_key>true</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>f1929c4074c74e32b7e4ac70c95476add194c0a0</word_id>
-					<id>ec8a047dffe3cf2e4d95ba3e26c3bac0382d95c9</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>integer</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>80c7c6394e75c6f7acbf75bae587afdc02d3990b</word_id>
-					<id>b095c44611ed08156277676d9a3a0ce52b9b05ef</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>89d26a106a3b0895ebfe6ccf9b5930ef4b1612c1</word_id>
-					<id>78715aa66a10a9b190ad69b8ed792e9a2f4946e3</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>c22eb21bd16761440f79d8782099fa4b0e9115cb</word_id>
-					<id>693f8af2fe6cf45255b6f2bc7e9077f3630c3dd8</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>nvarchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>3a0f10db94ed1cb6e8cb088ca0275b664d4fca4c</word_id>
-					<id>04216c384533b70b8e86b571fa2beef7157bab5a</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>cb6ff93372480fd7d11e66a1e9c9fa028149e99c</word_id>
-					<id>0b6f63094be90aa8674460cce26be10327827ceb</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>7b62803aab5f5a3c3f9ff63f7d5122a9ef3a41bb</word_id>
-					<id>363e8cfcf4a6b228e656decadacba29280906555</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>5cab10f2b339972b1f10cb150baf883a8adffdbb</word_id>
-					<id>7875aa5fee3d6f9587180fb8fce9343a56cdc34e</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>7b4cc71483ef98673d4cc313eb99314e27722e28</word_id>
-					<id>61c49a2f7807c55c8f85110c30889d5b403e4b04</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>datetime</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>bc2e5b104e72723c9c6710c9a3a02804111b6846</word_id>
-					<id>b91171b99f3628aadb0e6986fbfa30cc547b280e</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>datetime</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>54338e0229264fd01ec1efff7c49b30d966df58e</word_id>
-					<id>9f33d190101e56f93f5ece0fd7c5cdda3e704b4c</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>efa0f7e9084cf3b09f7e31101ec496a44aadaaa4</word_id>
-					<id>16121b5aa08fc170883408ec2d0487281a132d9d</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>5f188d6afcf9d1afbbe94ac6d92f800caef67cbe</word_id>
-					<id>1afc7f146271f5c90ea811aa24c08ce25d12552e</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>varchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>6adbc087f6a7805c1d979bee36098c497d399378</word_id>
-					<id>343f0db997b913f299b0496c4306d3617ad708de</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>nvarchar(n)</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-			</columns>
-			<indexes>
-			</indexes>
-			<complex_unique_key_list>
-			</complex_unique_key_list>
-			<table_properties>
-				<schema></schema>
-			</table_properties>
-		</table>
-	</contents>
-	<column_groups>
-			<column_group>
-				<id>845c82ebd869d5620b1ef2c2b6f438b11a045082</id>
-				<group_name>BaseEntity</group_name>
-				<columns>
-					<normal_column>
-						<word_id>e3325b6b7dc29b87da73eedcfff2a9c4cd245579</word_id>
-						<id>02ecedc0de5850cba25bc91919ed39d414b74111</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>a5d0a391d0d09acab89c829d271b0a96a7058ca0</word_id>
-						<id>2fe6a36385238c1b21c76deae00a7afa00ff5538</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>character(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-				</columns>
-			</column_group>
-			<column_group>
-				<id>ea920cba2fe0eaee64a2310ece7cda4b198b37ec</id>
-				<group_name>BaseEntityCorp</group_name>
-				<columns>
-					<normal_column>
-						<word_id>c71533e4d2f429ff8466fd6a8de5719f1741377b</word_id>
-						<id>b8ea4b73d6d32a222e5abfd453287575ae518480</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value>0</default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>11c59294fe142d108ca4dac5a03033f50188a450</word_id>
-						<id>b94f5fe344185c40739cf93d1090686001bb11e0</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value>JeeSite</default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-				</columns>
-			</column_group>
-			<column_group>
-				<id>35ae805d1da92afdb99b2fe8c536d1649356fccd</id>
-				<group_name>DataEntity</group_name>
-				<columns>
-					<normal_column>
-						<word_id>70d065a29d01e3875167a20441e0ebbfaf5a05f8</word_id>
-						<id>f0036584bd8711715579d21994a0105935605a7e</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>character(n)</type>
-						<constraint></constraint>
-						<default_value>0</default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>f60ca81cf3f5c08c518d0266d2b8fd1b219a9802</word_id>
-						<id>c391a15752a8eb58bc558a39d1b431f7ee125e0e</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>170410257b4d8e712b8c1d499b415de82ce9683c</word_id>
-						<id>e2e82ba86e15fd67397355e711255b1625078ae1</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>c60616703cf07aaf21f84215d092e2101efb9bca</word_id>
-						<id>fd0546fc2d4e01c35dcbc23913add68a99fabd73</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>b5c3a59170184a01c15c78a6778cb73083fe6321</word_id>
-						<id>f8ea4fc4a778a0b94398a661a1ed8608f0e8d28d</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>1a77879eeba6dd8a2ca8de0ca0cbd6db5ddeb7af</word_id>
-						<id>69e01b6d4f42df40a09540ef4ba10ed8e006abaa</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-				</columns>
-			</column_group>
-			<column_group>
-				<id>85024a2953cf3e3c9c1cce49b2351853ab0d125b</id>
-				<group_name>DataEntityNoStatus</group_name>
-				<columns>
-					<normal_column>
-						<word_id>f60ca81cf3f5c08c518d0266d2b8fd1b219a9802</word_id>
-						<id>e5355faba5ec3c9128507dd4c48ea9230631cf83</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>170410257b4d8e712b8c1d499b415de82ce9683c</word_id>
-						<id>6bed374c39d181003a4f92d76d79a4119176ba0c</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>c60616703cf07aaf21f84215d092e2101efb9bca</word_id>
-						<id>f9db19bb567760bbdd554d75bbfdc891c89f9da9</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>b5c3a59170184a01c15c78a6778cb73083fe6321</word_id>
-						<id>ee78b079f7d319bf8119fd01439cd97424ff49fa</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>1a77879eeba6dd8a2ca8de0ca0cbd6db5ddeb7af</word_id>
-						<id>f7b88ecec0ef386bb384c228842a7587432112fb</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-				</columns>
-			</column_group>
-			<column_group>
-				<id>118dab95fc1f792cd468b9f66af2d4fabd98c39b</id>
-				<group_name>ExtendEntity</group_name>
-				<columns>
-					<normal_column>
-						<word_id>b1acb2df17677e0ed818dea6e1150bfc088fcd50</word_id>
-						<id>6ccadddab6ce48441ca7abd798cda6f3debf4a0c</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>d27290b84b207a7c87f4d78d80e62048c67fac04</word_id>
-						<id>93ab0ba3b47b01934614dbd3e572358c9f99e6ea</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>5e25d7f0e327d2d760a04b32140b639bb96bfd8d</word_id>
-						<id>a78c7961910a5e697027d1a3530b1afaa8ea8c94</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>d05572af90653d4ddfd880402a15ed9b27c81888</word_id>
-						<id>40085364ec7a58653e96f8659aadd258d7556bc7</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>acc372d31709a1133f6c13fc8abfef7881ca26ed</word_id>
-						<id>9787d7fe93ee31c5b4979fd620ff6e4b2777eccf</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>59763a16504e4136a7a2fbed38476272d337105c</word_id>
-						<id>95c55b81b7e9e1a9bb01aa3d88fb90c648641c4e</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>600b96b04bf4f65919eabfc6613d3c5e370931e1</word_id>
-						<id>16f44dfc7964796f109293bc49afd58dcb4eec1f</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>a9dc80e5c484dc7b9d5fff9294eaa383819edc26</word_id>
-						<id>39b1dffa083f74afc30df621845cf7f0ed71394f</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>nvarchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>b67071354a8d43cabe9a0ac29303f8b144a15985</word_id>
-						<id>7584cc6360ae7edc99e1f619042eba5865b2c4c7</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>70b8240f049f658b97394b7d4784481fdb477f5c</word_id>
-						<id>f0b5383e05c6b3f6e5f65b33b33009826c83d014</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>ce377c081415847061b2efc58b701ff847dcaaca</word_id>
-						<id>260d5f31009fff18000d1e64f4f877926e621306</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>fb96f6dc60d31576c278a3c64024154eda67d3fe</word_id>
-						<id>a83144f40e7ae64e46a4b4ed651379774a953b17</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>0733a829c52af8af725ace50d4ed3e0179969f56</word_id>
-						<id>2a5203a275171a250870cf6cb224a910aa9354ec</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p,s)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>0b7230df29d6df213507c8855d019d2d55c9a561</word_id>
-						<id>3ef5bd65a7dcd74b9a9d8a292ec395f66b7de32b</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p,s)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>6cb3dad83f3e1f358155892dcee3167ef55bacc7</word_id>
-						<id>01d0849bdda56a8d8f24befdadc3fc9b007ae92b</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p,s)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>e54b261fc7ab81e0ef19a89e657453664abe5593</word_id>
-						<id>1c8ed63d72f40f0fe2f05815675771bdf3f824f8</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p,s)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>038ea74a700b763fa1f8fcdbd2c27e7941f82f7a</word_id>
-						<id>2b49e875138bfb329aaa352629650b7881435123</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>19aa2e40abff2bb4e908f18f5f5e5b30a074cd8b</word_id>
-						<id>5c6ec16226d85b0411b7077cb9a6e0c7aa8d74d1</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>06f59428b50e62e636a58a2f3cbcee2c75764506</word_id>
-						<id>d92b8f7fa7a2be49c7f00c447a603b136e84261d</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>8f08aeb4b9ceb072f0232d3d23fd5371ef8f379c</word_id>
-						<id>095a76f07a3cd2bdc6cc442757c11012e1974f4a</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>datetime</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>3962f4b130a803841a193a163e42679946b5ae1f</word_id>
-						<id>42c5d8f490f69b93e77698efa030ca23988ae696</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>false</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-				</columns>
-			</column_group>
-			<column_group>
-				<id>a535b6c506004a7fdf4d48984c9ff2cfa59c157a</id>
-				<group_name>TreeEntity</group_name>
-				<columns>
-					<normal_column>
-						<word_id>e4465172e2cc64907a386237cc7d0c7d79a074dc</word_id>
-						<id>394369b90c0a5b6efeed3cf823c642605d7a1653</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>b4f9837136b0a84afc9a611a563fb51141fdac1f</word_id>
-						<id>e8d877396943acfec73023dba2c1c6e3d7802d62</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>65265fefa00907a60e8fe2ebd6d2ad58760415e5</word_id>
-						<id>23f973124aedd0244533f4e7b3b103c548b966be</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>cf5f1e3cc5cc0869f539c3c5b2adf05677e367b8</word_id>
-						<id>984d5eac2b3221118a61655e4a5a49c78e0f0151</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>8fb086ad8b2a35cdf18c1a1e247005cdb140faf0</word_id>
-						<id>b2f246a3f0ade317eaa9915e2fd539abae5a5ec8</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>character(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>f22022df4ccf9c7081b4d8f98deed04c1d8c987c</word_id>
-						<id>f5a9968479420f08da2e98d21136b3ed4b6e396f</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>decimal(p)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-					<normal_column>
-						<word_id>44f852382fba107fe668304530dea0233f38a321</word_id>
-						<id>618194ebfc8c6c42efcef3a4af0b8054f6af209b</id>
-						<description></description>
-						<unique_key_name></unique_key_name>
-						<logical_name></logical_name>
-						<physical_name></physical_name>
-						<type>varchar(n)</type>
-						<constraint></constraint>
-						<default_value></default_value>
-						<auto_increment>false</auto_increment>
-						<foreign_key>false</foreign_key>
-						<not_null>true</not_null>
-						<primary_key>false</primary_key>
-						<unique_key>false</unique_key>
-						<character_set></character_set>
-						<collation></collation>
-						<sequence>
-							<name></name>
-							<schema></schema>
-							<increment></increment>
-							<min_value></min_value>
-							<max_value></max_value>
-							<start></start>
-							<cache></cache>
-							<nocache>false</nocache>
-							<cycle>false</cycle>
-							<order>false</order>
-							<description></description>
-							<data_type></data_type>
-							<decimal_size>0</decimal_size>
-						</sequence>
-					</normal_column>
-				</columns>
-			</column_group>
-	</column_groups>
-	<test_data_list>
-	</test_data_list>
-	<sequence_set>
-	</sequence_set>
-	<trigger_set>
-	</trigger_set>
-	<change_tracking_list>
-	</change_tracking_list>
-</diagram>
diff --git a/web/db/test.png b/web/db/test.png
deleted file mode 100644
index da422a4a..00000000
Binary files a/web/db/test.png and /dev/null differ
diff --git a/web/pom.xml b/web/pom.xml
index beb73051..3f8569f3 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -23,7 +23,7 @@
 		
 		<finalName>web</finalName><!-- war or jar 鍖呯殑鍚嶇О -->
 		<start-class>com.jeesite.modules.Application</start-class>
-		
+
 		<!-- docker setting -->
         <docker.run.port>8980:8980</docker.run.port>
 		
@@ -38,6 +38,13 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 
+		<!-- 娴嬭瘯妯″潡 -->
+		<dependency>
+			<groupId>com.jeesite</groupId>
+			<artifactId>jeesite-module-test</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+
 		<!-- 绉诲姩绔ā鍧� -->
 		<dependency>
 			<groupId>com.jeesite</groupId>
diff --git a/web/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java b/web/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java
deleted file mode 100644
index 7b96dda7..00000000
--- a/web/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.dao;
-
-import com.jeesite.common.dao.CrudDao;
-import com.jeesite.common.mybatis.annotation.MyBatisDao;
-import com.jeesite.modules.test.entity.TestDataChild;
-
-/**
- * 娴嬭瘯鏁版嵁DAO鎺ュ彛
- * @author ThinkGem
- * @version 2018-04-22
- */
-@MyBatisDao//(dataSourceName="ds2")
-public interface TestDataChildDao extends CrudDao<TestDataChild> {
-	
-}
\ No newline at end of file
diff --git a/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java b/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java
deleted file mode 100644
index 52aea481..00000000
--- a/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.dao;
-
-import java.util.List;
-import java.util.Map;
-
-import com.jeesite.common.dao.CrudDao;
-import com.jeesite.common.mybatis.annotation.MyBatisDao;
-import com.jeesite.modules.test.entity.TestData;
-
-/**
- * 娴嬭瘯鏁版嵁DAO鎺ュ彛
- * @author ThinkGem
- * @version 2018-04-22
- */
-@MyBatisDao
-public interface TestDataDao extends CrudDao<TestData> {
-	
-	/**
-	 * 婕旂ずMap鍙傛暟鍜岃繑鍥炲�硷紝鏀寔鍒嗛〉
-	 */
-	List<Map<String, Object>> findListForMap(Map<String, Object> params);
-	
-}
\ No newline at end of file
diff --git a/web/src/main/java/com/jeesite/modules/test/dao/TestTreeDao.java b/web/src/main/java/com/jeesite/modules/test/dao/TestTreeDao.java
deleted file mode 100644
index 7648d4cd..00000000
--- a/web/src/main/java/com/jeesite/modules/test/dao/TestTreeDao.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.dao;
-
-import com.jeesite.common.dao.TreeDao;
-import com.jeesite.common.mybatis.annotation.MyBatisDao;
-import com.jeesite.modules.test.entity.TestTree;
-
-/**
- * 娴嬭瘯鏍戣〃DAO鎺ュ彛
- * @author ThinkGem
- * @version 2018-04-22
- */
-@MyBatisDao
-public interface TestTreeDao extends TreeDao<TestTree> {
-	
-}
\ No newline at end of file
diff --git a/web/src/main/java/com/jeesite/modules/test/db/InitTestData.java b/web/src/main/java/com/jeesite/modules/test/db/InitTestData.java
deleted file mode 100644
index 376844b7..00000000
--- a/web/src/main/java/com/jeesite/modules/test/db/InitTestData.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.db;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Component;
-
-import com.jeesite.common.config.Global;
-import com.jeesite.common.lang.StringUtils;
-import com.jeesite.common.tests.BaseInitDataTests;
-import com.jeesite.modules.gen.entity.GenTable;
-import com.jeesite.modules.gen.entity.GenTableColumn;
-import com.jeesite.modules.gen.service.GenTableService;
-import com.jeesite.modules.gen.utils.GenUtils;
-
-/**
- * 鍒濆鍖栨牳蹇冭〃鏁版嵁
- * @author ThinkGem
- * @version 2020-5-26
- */
-@Component
-@ConditionalOnProperty(name="jeesite.initdata", havingValue="true", matchIfMissing=false)
-public class InitTestData extends BaseInitDataTests {
-
-	@Override
-	public boolean initData() throws Exception {
-		if (GenUtils.isTableExists("test_data")) {
-			return true; // 濡傛灉琛ㄥ凡瀛樺湪锛屽垯鏃犻渶鍒濆鍖�
-		}
-		runCreateScript("test.sql");
-		initGenDemoData();
-		return true;
-	}
-	
-	@Autowired
-	private GenTableService genTableService;
-	/**
-	 * 浠ｇ爜鐢熸垚娴嬭瘯鏁版嵁
-	 */
-	public void initGenDemoData() throws Exception{
-		if (!checkTable(GenTable.class)) {
-			return;
-		}
-		if (!checkTable(GenTableColumn.class)) {
-			return;
-		}
-		initGenTestData();
-		initGenTreeData();
-	}
-	/**
-	 * 浠ｇ爜鐢熸垚娴嬭瘯鏁版嵁
-	 */
-	private void initGenTestData() throws Exception{
-		GenTable genTable = new GenTable();
-		genTable.setIsNewRecord(true);
-		genTable.setTableName("test_data");
-		genTable = genTableService.getFromDb(genTable);
-		genTable.setIsNewRecord(true);
-		genTable.setClassName("TestData");
-		genTable.setFunctionAuthor("ThinkGem");
-		genTable.setTplCategory("crud");
-		genTable.setPackageName("com.jeesite.modules");
-		genTable.setModuleName("test");
-		genTable.setSubModuleName("");
-		genTable.setFunctionName("娴嬭瘯鏁版嵁");
-		genTable.setFunctionNameSimple("鏁版嵁");
-		genTable.getOptionMap().put("isHaveDisableEnable", Global.YES);
-		genTable.getOptionMap().put("isHaveDelete", Global.YES);
-		genTable.getOptionMap().put("isFileUpload", Global.YES);
-		genTable.getOptionMap().put("isImageUpload", Global.YES);
-		initGenTableColumn(genTable);
-		genTableService.save(genTable);
-		// 瀛愯〃
-		GenTable genTableChild = new GenTable();
-		genTableChild.setIsNewRecord(true);
-		genTableChild.setTableName("test_data_child");
-		genTableChild = genTableService.getFromDb(genTableChild);
-		genTableChild.setIsNewRecord(true);
-		genTableChild.setClassName("TestDataChild");
-		genTableChild.setFunctionAuthor("ThinkGem");
-		genTableChild.setTplCategory("crud");
-		genTableChild.setPackageName("com.jeesite.modules");
-		genTableChild.setModuleName("test");
-		genTableChild.setSubModuleName("");
-		genTableChild.setFunctionName("娴嬭瘯瀛愯〃");
-		genTableChild.setFunctionNameSimple("鏁版嵁");
-		genTableChild.setParentTableName("test_data");
-		genTableChild.setParentTableFkName("test_data_id");
-		initGenTableColumn(genTableChild);
-		genTableService.save(genTableChild);
-	}
-	
-	/**
-	 * 浠ｇ爜鐢熸垚娴嬭瘯鏁版嵁锛堝垪鍒濆鍖栵級
-	 */
-	private void initGenTableColumn(GenTable genTable){
-		for(GenTableColumn column : genTable.getColumnList()){
-			if ("test_input".equals(column.getColumnName())
-					|| "test_textarea".equals(column.getColumnName())
-					|| "test_select".equals(column.getColumnName())
-					|| "test_select_multiple".equals(column.getColumnName())
-					|| "test_checkbox".equals(column.getColumnName())
-					|| "test_radio".equals(column.getColumnName())
-					|| "test_date".equals(column.getColumnName())
-					|| "test_datetime".equals(column.getColumnName())
-				){
-				column.setShowType(StringUtils.substringAfter(
-						column.getColumnName(), "test_"));
-				if ("test_input".equals(column.getColumnName())
-						){
-					column.setQueryType("LIKE");
-				}
-				else if ("test_textarea".equals(column.getColumnName())
-						){
-					column.setQueryType("LIKE");
-					column.getOptionMap().put("isNewLine", Global.YES);
-//					column.getOptionMap().put("gridRowCol", "12/2/10");
-				}
-				else if ("test_select".equals(column.getColumnName())
-						|| "test_select_multiple".equals(column.getColumnName())
-						|| "test_radio".equals(column.getColumnName())
-						|| "test_checkbox".equals(column.getColumnName())
-						){
-					column.getOptionMap().put("dictType", "sys_menu_type");
-					column.getOptionMap().put("dictName", "sys_menu_type");
-				}
-				else if ("test_date".equals(column.getColumnName())
-						|| "test_datetime".equals(column.getColumnName())
-						){
-					column.setQueryType("BETWEEN");
-				}
-			}else if ("test_user_code".equals(column.getColumnName())){
-				column.setAttrType("com.jeesite.modules.sys.entity.User");
-				column.setFullAttrName("testUser");
-				column.setShowType("userselect");
-			}else if ("test_office_code".equals(column.getColumnName())){
-				column.setAttrType("com.jeesite.modules.sys.entity.Office");
-				column.setFullAttrName("testOffice");
-				column.setShowType("officeselect");
-			}else if ("test_area_code".equals(column.getColumnName())){
-				column.setFullAttrName("testAreaCode|testAreaName");
-				column.setShowType("areaselect");
-			}else if ("test_area_name".equals(column.getColumnName())){
-				column.setIsEdit(Global.NO);
-				column.setIsQuery(Global.NO);
-			}else if ("test_data_id".equals(column.getColumnName())){
-				column.setFullAttrName("testData");
-			}
-		}
-	}
-	
-	/**
-	 * 浠ｇ爜鐢熸垚鏍戣〃娴嬭瘯鏁版嵁
-	 */
-	private void initGenTreeData() throws Exception{
-		GenTable genTable = new GenTable();
-		genTable.setIsNewRecord(true);
-		genTable.setTableName("test_tree");
-		genTable = genTableService.getFromDb(genTable);
-		genTable.setIsNewRecord(true);
-		genTable.setClassName("TestTree");
-		genTable.setFunctionAuthor("ThinkGem");
-		genTable.setTplCategory("treeGrid");
-		genTable.setPackageName("com.jeesite.modules");
-		genTable.setModuleName("test");
-		genTable.setSubModuleName("");
-		genTable.setFunctionName("娴嬭瘯鏍戣〃");
-		genTable.setFunctionNameSimple("鏁版嵁");
-		genTable.getOptionMap().put("isHaveDisableEnable", Global.YES);
-		genTable.getOptionMap().put("isHaveDelete", Global.YES);
-		genTable.getOptionMap().put("isFileUpload", Global.YES);
-		genTable.getOptionMap().put("isImageUpload", Global.YES);
-		genTable.getOptionMap().put("treeViewCode", "tree_code");
-		genTable.getOptionMap().put("treeViewName", "tree_name");
-		initGenTableColumn(genTable);
-		genTableService.save(genTable);
-	}
-	
-}
diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java b/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
deleted file mode 100644
index 4a83a789..00000000
--- a/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.entity;
-
-import javax.validation.constraints.Size;
-import java.util.Date;
-import com.jeesite.common.mybatis.annotation.JoinTable;
-import com.jeesite.common.mybatis.annotation.JoinTable.Type;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jeesite.modules.sys.entity.User;
-import com.jeesite.modules.sys.entity.Office;
-
-import com.jeesite.common.entity.DataEntity;
-import com.jeesite.common.mybatis.annotation.Column;
-import com.jeesite.common.mybatis.annotation.Table;
-import com.jeesite.common.mybatis.mapper.query.QueryType;
-
-/**
- * 娴嬭瘯鏁版嵁Entity
- * @author ThinkGem
- * @version 2018-04-22
- */
-@Table(name="test_data_child", alias="a", columns={
-		@Column(name="id", attrName="id", label="缂栧彿", isPK=true),
-		@Column(name="test_sort", attrName="testSort", label="鎺掑簭鍙�"),
-		@Column(name="test_data_id", attrName="testData.id", label="鐖惰〃涓婚敭"),
-		@Column(name="test_input", attrName="testInput", label="鍗曡鏂囨湰", queryType=QueryType.LIKE),
-		@Column(name="test_textarea", attrName="testTextarea", label="澶氳鏂囨湰", queryType=QueryType.LIKE),
-		@Column(name="test_select", attrName="testSelect", label="涓嬫媺妗�"),
-		@Column(name="test_select_multiple", attrName="testSelectMultiple", label="涓嬫媺澶氶��"),
-		@Column(name="test_radio", attrName="testRadio", label="鍗曢�夋"),
-		@Column(name="test_checkbox", attrName="testCheckbox", label="澶嶉�夋"),
-		@Column(name="test_date", attrName="testDate", label="鏃ユ湡閫夋嫨", isUpdateForce=true),
-		@Column(name="test_datetime", attrName="testDatetime", label="鏃ユ湡鏃堕棿", isUpdateForce=true),
-		@Column(name="test_user_code", attrName="testUser.userCode", label="鐢ㄦ埛閫夋嫨"),
-		@Column(name="test_office_code", attrName="testOffice.officeCode", label="鏈烘瀯閫夋嫨"),
-		@Column(name="test_area_code", attrName="testAreaCode", label="鍖哄煙閫夋嫨"),
-		@Column(name="test_area_name", attrName="testAreaName", label="鍖哄煙鍚嶇О", isQuery=false),
-	}, joinTable={
-		@JoinTable(type=Type.LEFT_JOIN, entity=User.class, attrName="testUser", alias="u12",
-			on="u12.user_code = a.test_user_code", columns={
-				@Column(name="user_code", label="鐢ㄦ埛缂栫爜", isPK=true),
-				@Column(name="user_name", label="鐢ㄦ埛鍚嶇О", isQuery=false),
-		}),
-		@JoinTable(type=Type.LEFT_JOIN, entity=Office.class, attrName="testOffice", alias="u13",
-			on="u13.office_code = a.test_office_code", columns={
-				@Column(name="office_code", label="鏈烘瀯缂栫爜", isPK=true),
-				@Column(name="office_name", label="鏈烘瀯鍚嶇О", isQuery=false),
-		}),
-	}, orderBy="a.id ASC"
-)
-public class TestDataChild extends DataEntity<TestDataChild> {
-	
-	private static final long serialVersionUID = 1L;
-	private Long testSort;		// 鎺掑簭鍙�
-	private TestData testData;		// 鐖惰〃涓婚敭 鐖剁被
-	private String testInput;		// 鍗曡鏂囨湰
-	private String testTextarea;		// 澶氳鏂囨湰
-	private String testSelect;		// 涓嬫媺妗�
-	private String testSelectMultiple;		// 涓嬫媺澶氶��
-	private String testRadio;		// 鍗曢�夋
-	private String testCheckbox;		// 澶嶉�夋
-	private Date testDate;		// 鏃ユ湡閫夋嫨
-	private Date testDatetime;		// 鏃ユ湡鏃堕棿
-	private User testUser;		// 鐢ㄦ埛閫夋嫨
-	private Office testOffice;		// 鏈烘瀯閫夋嫨
-	private String testAreaCode;		// 鍖哄煙閫夋嫨
-	private String testAreaName;		// 鍖哄煙鍚嶇О
-	
-	public TestDataChild() {
-		this(null);
-	}
-
-
-	public TestDataChild(TestData testData){
-		this.testData = testData;
-	}
-	
-	public Long getTestSort() {
-		return testSort;
-	}
-
-	public void setTestSort(Long testSort) {
-		this.testSort = testSort;
-	}
-	
-	@Size(min=0, max=64, message="鐖惰〃涓婚敭闀垮害涓嶈兘瓒呰繃 64 涓瓧绗�")
-	public TestData getTestData() {
-		return testData;
-	}
-
-	public void setTestData(TestData testData) {
-		this.testData = testData;
-	}
-	
-	@Size(min=0, max=200, message="鍗曡鏂囨湰闀垮害涓嶈兘瓒呰繃 200 涓瓧绗�")
-	public String getTestInput() {
-		return testInput;
-	}
-
-	public void setTestInput(String testInput) {
-		this.testInput = testInput;
-	}
-	
-	@Size(min=0, max=200, message="澶氳鏂囨湰闀垮害涓嶈兘瓒呰繃 200 涓瓧绗�")
-	public String getTestTextarea() {
-		return testTextarea;
-	}
-
-	public void setTestTextarea(String testTextarea) {
-		this.testTextarea = testTextarea;
-	}
-	
-	@Size(min=0, max=10, message="涓嬫媺妗嗛暱搴︿笉鑳借秴杩� 10 涓瓧绗�")
-	public String getTestSelect() {
-		return testSelect;
-	}
-
-	public void setTestSelect(String testSelect) {
-		this.testSelect = testSelect;
-	}
-	
-	@Size(min=0, max=200, message="涓嬫媺澶氶�夐暱搴︿笉鑳借秴杩� 200 涓瓧绗�")
-	public String getTestSelectMultiple() {
-		return testSelectMultiple;
-	}
-
-	public void setTestSelectMultiple(String testSelectMultiple) {
-		this.testSelectMultiple = testSelectMultiple;
-	}
-	
-	@Size(min=0, max=10, message="鍗曢�夋闀垮害涓嶈兘瓒呰繃 10 涓瓧绗�")
-	public String getTestRadio() {
-		return testRadio;
-	}
-
-	public void setTestRadio(String testRadio) {
-		this.testRadio = testRadio;
-	}
-	
-	@Size(min=0, max=200, message="澶嶉�夋闀垮害涓嶈兘瓒呰繃 200 涓瓧绗�")
-	public String getTestCheckbox() {
-		return testCheckbox;
-	}
-
-	public void setTestCheckbox(String testCheckbox) {
-		this.testCheckbox = testCheckbox;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	public Date getTestDate() {
-		return testDate;
-	}
-
-	public void setTestDate(Date testDate) {
-		this.testDate = testDate;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-	public Date getTestDatetime() {
-		return testDatetime;
-	}
-
-	public void setTestDatetime(Date testDatetime) {
-		this.testDatetime = testDatetime;
-	}
-	
-	public User getTestUser() {
-		return testUser;
-	}
-
-	public void setTestUser(User testUser) {
-		this.testUser = testUser;
-	}
-	
-	public Office getTestOffice() {
-		return testOffice;
-	}
-
-	public void setTestOffice(Office testOffice) {
-		this.testOffice = testOffice;
-	}
-	
-	@Size(min=0, max=64, message="鍖哄煙閫夋嫨闀垮害涓嶈兘瓒呰繃 64 涓瓧绗�")
-	public String getTestAreaCode() {
-		return testAreaCode;
-	}
-
-	public void setTestAreaCode(String testAreaCode) {
-		this.testAreaCode = testAreaCode;
-	}
-	
-	@Size(min=0, max=100, message="鍖哄煙鍚嶇О闀垮害涓嶈兘瓒呰繃 100 涓瓧绗�")
-	public String getTestAreaName() {
-		return testAreaName;
-	}
-
-	public void setTestAreaName(String testAreaName) {
-		this.testAreaName = testAreaName;
-	}
-	
-	public Date getTestDate_gte() {
-		return sqlMap.getWhere().getValue("test_date", QueryType.GTE);
-	}
-
-	public void setTestDate_gte(Date testDate) {
-		sqlMap.getWhere().and("test_date", QueryType.GTE, testDate);
-	}
-	
-	public Date getTestDate_lte() {
-		return sqlMap.getWhere().getValue("test_date", QueryType.LTE);
-	}
-
-	public void setTestDate_lte(Date testDate) {
-		sqlMap.getWhere().and("test_date", QueryType.LTE, testDate);
-	}
-	
-	public Date getTestDatetime_gte() {
-		return sqlMap.getWhere().getValue("test_datetime", QueryType.GTE);
-	}
-
-	public void setTestDatetime_gte(Date testDatetime) {
-		sqlMap.getWhere().and("test_datetime", QueryType.GTE, testDatetime);
-	}
-	
-	public Date getTestDatetime_lte() {
-		return sqlMap.getWhere().getValue("test_datetime", QueryType.LTE);
-	}
-
-	public void setTestDatetime_lte(Date testDatetime) {
-		sqlMap.getWhere().and("test_datetime", QueryType.LTE, testDatetime);
-	}
-	
-}
\ No newline at end of file
diff --git a/web/src/main/java/com/jeesite/modules/test/service/TestTreeService.java b/web/src/main/java/com/jeesite/modules/test/service/TestTreeService.java
deleted file mode 100644
index ced00001..00000000
--- a/web/src/main/java/com/jeesite/modules/test/service/TestTreeService.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.service;
-
-import com.jeesite.common.service.TreeService;
-import com.jeesite.modules.file.utils.FileUploadUtils;
-import com.jeesite.modules.test.dao.TestTreeDao;
-import com.jeesite.modules.test.entity.TestTree;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 娴嬭瘯鏍戣〃Service
- * @author ThinkGem
- * @version 2018-04-22
- */
-@Service
-public class TestTreeService extends TreeService<TestTreeDao, TestTree> {
-	
-	/**
-	 * 鑾峰彇鍗曟潯鏁版嵁
-	 * @param testTree
-	 * @return
-	 */
-	@Override
-	public TestTree get(TestTree testTree) {
-		return super.get(testTree);
-	}
-	
-	/**
-	 * 鏌ヨ鍒楄〃鏁版嵁
-	 * @param testTree
-	 * @return
-	 */
-	@Override
-	public List<TestTree> findList(TestTree testTree) {
-		return super.findList(testTree);
-	}
-	
-	/**
-	 * 淇濆瓨鏁版嵁锛堟彃鍏ユ垨鏇存柊锛�
-	 * @param testTree
-	 */
-	@Override
-	@Transactional
-	public void save(TestTree testTree) {
-		super.save(testTree);
-		// 淇濆瓨涓婁紶鍥剧墖
-		FileUploadUtils.saveFileUpload(testTree, testTree.getId(), "testTree_image");
-		// 淇濆瓨涓婁紶闄勪欢
-		FileUploadUtils.saveFileUpload(testTree, testTree.getId(), "testTree_file");
-	}
-	
-	/**
-	 * 鏇存柊鐘舵��
-	 * @param testTree
-	 */
-	@Override
-	@Transactional
-	public void updateStatus(TestTree testTree) {
-		super.updateStatus(testTree);
-	}
-	
-	/**
-	 * 鍒犻櫎鏁版嵁
-	 * @param testTree
-	 */
-	@Override
-	@Transactional
-	public void delete(TestTree testTree) {
-		testTree.sqlMap().markIdDelete(); // 閫昏緫鍒犻櫎鏃舵爣璁癐D鍊�
-		super.delete(testTree);
-	}
-	
-}
\ No newline at end of file
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
deleted file mode 100644
index 63be2d92..00000000
--- a/web/src/main/java/com/jeesite/modules/test/web/DemoController.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.web;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.jeesite.common.lang.StringUtils;
-import com.jeesite.common.web.BaseController;
-import com.jeesite.modules.test.entity.TestData;
-import com.jeesite.modules.test.service.TestDataService;
-
-/**
- * 婕旂ず瀹炰緥Controller
- * @author ThinkGem
- * @version 2018-03-24
- */
-@Controller
-@RequestMapping(value = "${adminPath}/demo")
-public class DemoController extends BaseController {
-
-	@Autowired
-	private TestDataService testDataService;
-	
-	/**
-	 * 鑾峰彇鏁版嵁
-	 */
-	@ModelAttribute
-	public TestData get(String id, boolean isNewRecord) {
-		return testDataService.get(id, isNewRecord);
-	}
-	
-	/**
-	 * DataGrid
-	 */
-	@RequiresPermissions("test:testData:view")
-	@RequestMapping(value = "dataGrid/{viewName}")
-	public String dataGrid(@PathVariable String viewName, TestData testData, Model model) {
-		return "modules/demo/demoDataGrid" + StringUtils.cap(viewName);
-	}
-	
-	/**
-	 * Form
-	 */
-	@RequiresPermissions("test:testData:view")
-	@RequestMapping(value = "form/{viewName}")
-	public String form(@PathVariable String viewName, TestData testData, Model model) {
-		return "modules/demo/demoForm" + StringUtils.cap(viewName);
-	}
-	
-}
\ No newline at end of file
diff --git a/web/src/main/java/com/jeesite/modules/test/web/TestTreeController.java b/web/src/main/java/com/jeesite/modules/test/web/TestTreeController.java
deleted file mode 100644
index a93002eb..00000000
--- a/web/src/main/java/com/jeesite/modules/test/web/TestTreeController.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.modules.test.web;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.jeesite.common.config.Global;
-import com.jeesite.common.collect.ListUtils;
-import com.jeesite.common.collect.MapUtils;
-import com.jeesite.common.lang.StringUtils;
-import com.jeesite.common.idgen.IdGen;
-import com.jeesite.modules.sys.utils.UserUtils;
-import com.jeesite.common.web.BaseController;
-import com.jeesite.modules.test.entity.TestTree;
-import com.jeesite.modules.test.service.TestTreeService;
-
-/**
- * 娴嬭瘯鏍戣〃Controller
- * @author ThinkGem
- * @version 2018-04-22
- */
-@Controller
-@RequestMapping(value = "${adminPath}/test/testTree")
-public class TestTreeController extends BaseController {
-
-	@Autowired
-	private TestTreeService testTreeService;
-	
-	/**
-	 * 鑾峰彇鏁版嵁
-	 */
-	@ModelAttribute
-	public TestTree get(String treeCode, boolean isNewRecord) {
-		return testTreeService.get(treeCode, isNewRecord);
-	}
-	
-	/**
-	 * 鏌ヨ鍒楄〃
-	 */
-	@RequiresPermissions("test:testTree:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(TestTree testTree, Model model) {
-		model.addAttribute("testTree", testTree);
-		return "modules/test/testTreeList";
-	}
-	
-	/**
-	 * 鏌ヨ鍒楄〃鏁版嵁
-	 */
-	@RequiresPermissions("test:testTree:view")
-	@RequestMapping(value = "listData")
-	@ResponseBody
-	public List<TestTree> listData(TestTree testTree) {
-		if (StringUtils.isBlank(testTree.getParentCode())) {
-			testTree.setParentCode(TestTree.ROOT_CODE);
-		}
-		if (StringUtils.isNotBlank(testTree.getTreeName())){
-			testTree.setParentCode(null);
-		}
-		if (StringUtils.isNotBlank(testTree.getRemarks())){
-			testTree.setParentCode(null);
-		}
-		List<TestTree> list = testTreeService.findList(testTree);
-		return list;
-	}
-
-	/**
-	 * 鏌ョ湅缂栬緫琛ㄥ崟
-	 */
-	@RequiresPermissions("test:testTree:view")
-	@RequestMapping(value = "form")
-	public String form(TestTree testTree, Model model) {
-		// 鍒涘缓骞跺垵濮嬪寲涓嬩竴涓妭鐐逛俊鎭�
-		testTree = createNextNode(testTree);
-		model.addAttribute("testTree", testTree);
-		return "modules/test/testTreeForm";
-	}
-	
-	/**
-	 * 鍒涘缓骞跺垵濮嬪寲涓嬩竴涓妭鐐逛俊鎭紝濡傦細鎺掑簭鍙枫�侀粯璁ゅ��
-	 */
-	@RequiresPermissions("test:testTree:edit")
-	@RequestMapping(value = "createNextNode")
-	@ResponseBody
-	public TestTree createNextNode(TestTree testTree) {
-		if (StringUtils.isNotBlank(testTree.getParentCode())){
-			testTree.setParent(testTreeService.get(testTree.getParentCode()));
-		}
-		if (testTree.getIsNewRecord()) {
-			TestTree where = new TestTree();
-			where.setParentCode(testTree.getParentCode());
-			TestTree last = testTreeService.getLastByParentCode(where);
-			// 鑾峰彇鍒颁笅绾ф渶鍚庝竴涓妭鐐�
-			if (last != null){
-				testTree.setTreeSort(last.getTreeSort() + 30);
-				testTree.setTreeCode(IdGen.nextCode(last.getTreeCode()));
-			}else if (testTree.getParent() != null){
-				testTree.setTreeCode(testTree.getParent().getTreeCode() + "001");
-			}
-		}
-		// 浠ヤ笅璁剧疆琛ㄥ崟榛樿鏁版嵁
-		if (testTree.getTreeSort() == null){
-			testTree.setTreeSort(TestTree.DEFAULT_TREE_SORT);
-		}
-		return testTree;
-	}
-
-	/**
-	 * 淇濆瓨鏁版嵁
-	 */
-	@RequiresPermissions("test:testTree:edit")
-	@PostMapping(value = "save")
-	@ResponseBody
-	public String save(@Validated TestTree testTree) {
-		testTreeService.save(testTree);
-		return renderResult(Global.TRUE, text("淇濆瓨鏁版嵁鎴愬姛锛�"));
-	}
-	
-	/**
-	 * 鍋滅敤鏁版嵁
-	 */
-	@RequiresPermissions("test:testTree:edit")
-	@RequestMapping(value = "disable")
-	@ResponseBody
-	public String disable(TestTree testTree) {
-		TestTree where = new TestTree();
-		where.setStatus(TestTree.STATUS_NORMAL);
-		where.setParentCodes("," + testTree.getId() + ",");
-		long count = testTreeService.findCount(where);
-		if (count > 0) {
-			return renderResult(Global.FALSE, text("璇ユ暟鎹寘鍚湭鍋滅敤鐨勫瓙鏁版嵁锛�"));
-		}
-		testTree.setStatus(TestTree.STATUS_DISABLE);
-		testTreeService.updateStatus(testTree);
-		return renderResult(Global.TRUE, text("鍋滅敤鏁版嵁鎴愬姛"));
-	}
-	
-	/**
-	 * 鍚敤鏁版嵁
-	 */
-	@RequiresPermissions("test:testTree:edit")
-	@RequestMapping(value = "enable")
-	@ResponseBody
-	public String enable(TestTree testTree) {
-		testTree.setStatus(TestTree.STATUS_NORMAL);
-		testTreeService.updateStatus(testTree);
-		return renderResult(Global.TRUE, text("鍚敤鏁版嵁鎴愬姛"));
-	}
-	
-	/**
-	 * 鍒犻櫎鏁版嵁
-	 */
-	@RequiresPermissions("test:testTree:edit")
-	@RequestMapping(value = "delete")
-	@ResponseBody
-	public String delete(TestTree testTree) {
-		testTreeService.delete(testTree);
-		return renderResult(Global.TRUE, text("鍒犻櫎鏁版嵁鎴愬姛锛�"));
-	}
-	
-	/**
-	 * 鑾峰彇鏍戠粨鏋勬暟鎹�
-	 * @param excludeCode 鎺掗櫎鐨凜ode
-	 * @param isShowCode 鏄惁鏄剧ず缂栫爜锛坱rue or 1锛氭樉绀哄湪宸︿晶锛�2锛氭樉绀哄湪鍙充晶锛沠alse or null锛氫笉鏄剧ず锛�
-	 * @return
-	 */
-	@RequiresPermissions("test:testTree:view")
-	@RequestMapping(value = "treeData")
-	@ResponseBody
-	public List<Map<String, Object>> treeData(String excludeCode, String isShowCode) {
-		List<Map<String, Object>> mapList = ListUtils.newArrayList();
-		List<TestTree> list = testTreeService.findList(new TestTree());
-		for (int i=0; i<list.size(); i++){
-			TestTree e = list.get(i);
-			// 杩囨护闈炴甯哥殑鏁版嵁
-			if (!TestTree.STATUS_NORMAL.equals(e.getStatus())){
-				continue;
-			}
-			// 杩囨护琚帓闄ょ殑缂栫爜锛堝寘鎷墍鏈夊瓙绾э級
-			if (StringUtils.isNotBlank(excludeCode)){
-				if (e.getId().equals(excludeCode)){
-					continue;
-				}
-				if (e.getParentCodes().contains("," + excludeCode + ",")){
-					continue;
-				}
-			}
-			Map<String, Object> map = MapUtils.newHashMap();
-			map.put("id", e.getId());
-			map.put("pId", e.getParentCode());
-			map.put("name", StringUtils.getTreeNodeName(isShowCode, e.getTreeCode(), e.getTreeName()));
-			mapList.add(map);
-		}
-		return mapList;
-	}
-
-	/**
-	 * 淇琛ㄧ粨鏋勭浉鍏虫暟鎹�
-	 */
-	@RequiresPermissions("test:testTree:edit")
-	@RequestMapping(value = "fixTreeData")
-	@ResponseBody
-	public String fixTreeData(TestTree testTree){
-		if (!UserUtils.getUser().isAdmin()){
-			return renderResult(Global.FALSE, "鎿嶄綔澶辫触锛屽彧鏈夌鐞嗗憳鎵嶈兘杩涜淇锛�");
-		}
-		testTreeService.fixTreeData();
-		return renderResult(Global.TRUE, "鏁版嵁淇鎴愬姛");
-	}
-	
-}
\ No newline at end of file
diff --git a/web/src/main/resources/db/create/h2/test.sql b/web/src/main/resources/db/create/h2/test.sql
deleted file mode 100644
index 11cf00cd..00000000
--- a/web/src/main/resources/db/create/h2/test.sql
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL,
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date datetime,
-	test_datetime datetime,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date datetime NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date datetime NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL,
-	test_sort int,
-	test_data_id varchar(64),
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date datetime,
-	test_datetime datetime,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	tree_name varchar(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date datetime NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date datetime NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (tree_code)
-);
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '娴嬭瘯鏁版嵁';
-COMMENT ON COLUMN test_data.id IS '缂栧彿';
-COMMENT ON COLUMN test_data.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON COLUMN test_data.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_data.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_data.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_data.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_data.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_data.remarks IS '澶囨敞淇℃伅';
-COMMENT ON TABLE test_data_child IS '娴嬭瘯鏁版嵁瀛愯〃';
-COMMENT ON COLUMN test_data_child.id IS '缂栧彿';
-COMMENT ON COLUMN test_data_child.test_sort IS '鎺掑簭鍙�';
-COMMENT ON COLUMN test_data_child.test_data_id IS '鐖惰〃涓婚敭';
-COMMENT ON COLUMN test_data_child.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data_child.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data_child.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data_child.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON TABLE test_tree IS '娴嬭瘯鏍戣〃';
-COMMENT ON COLUMN test_tree.tree_code IS '鑺傜偣缂栫爜';
-COMMENT ON COLUMN test_tree.parent_code IS '鐖剁骇缂栧彿';
-COMMENT ON COLUMN test_tree.parent_codes IS '鎵�鏈夌埗绾х紪鍙�';
-COMMENT ON COLUMN test_tree.tree_sort IS '鎺掑簭鍙凤紙鍗囧簭锛�';
-COMMENT ON COLUMN test_tree.tree_sorts IS '鎵�鏈夋帓搴忓彿';
-COMMENT ON COLUMN test_tree.tree_leaf IS '鏄惁鏈�鏈骇';
-COMMENT ON COLUMN test_tree.tree_level IS '灞傛绾у埆';
-COMMENT ON COLUMN test_tree.tree_names IS '鍏ㄨ妭鐐瑰悕';
-COMMENT ON COLUMN test_tree.tree_name IS '鑺傜偣鍚嶇О';
-COMMENT ON COLUMN test_tree.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_tree.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_tree.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_tree.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_tree.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_tree.remarks IS '澶囨敞淇℃伅';
-
-
-
diff --git a/web/src/main/resources/db/create/mssql/test.sql b/web/src/main/resources/db/create/mssql/test.sql
deleted file mode 100644
index 4ae8a769..00000000
--- a/web/src/main/resources/db/create/mssql/test.sql
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE [test_data]
-(
-	[id] varchar(64) NOT NULL,
-	[test_input] varchar(200),
-	[test_textarea] nvarchar(200),
-	[test_select] varchar(10),
-	[test_select_multiple] varchar(200),
-	[test_radio] varchar(10),
-	[test_checkbox] varchar(200),
-	[test_date] datetime,
-	[test_datetime] datetime,
-	[test_user_code] varchar(64),
-	[test_office_code] varchar(64),
-	[test_area_code] varchar(64),
-	[test_area_name] nvarchar(100),
-	[status] char(1) DEFAULT '0' NOT NULL,
-	[create_by] varchar(64) NOT NULL,
-	[create_date] datetime NOT NULL,
-	[update_by] varchar(64) NOT NULL,
-	[update_date] datetime NOT NULL,
-	[remarks] nvarchar(500),
-	PRIMARY KEY ([id])
-);
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE [test_data_child]
-(
-	[id] varchar(64) NOT NULL,
-	[test_sort] int,
-	[test_data_id] varchar(64),
-	[test_input] varchar(200),
-	[test_textarea] nvarchar(200),
-	[test_select] varchar(10),
-	[test_select_multiple] varchar(200),
-	[test_radio] varchar(10),
-	[test_checkbox] varchar(200),
-	[test_date] datetime,
-	[test_datetime] datetime,
-	[test_user_code] varchar(64),
-	[test_office_code] varchar(64),
-	[test_area_code] varchar(64),
-	[test_area_name] nvarchar(100),
-	PRIMARY KEY ([id])
-);
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE [test_tree]
-(
-	[tree_code] varchar(64) NOT NULL,
-	[parent_code] varchar(64) NOT NULL,
-	[parent_codes] varchar(767) NOT NULL,
-	[tree_sort] decimal(10) NOT NULL,
-	[tree_sorts] varchar(767) NOT NULL,
-	[tree_leaf] char(1) NOT NULL,
-	[tree_level] decimal(4) NOT NULL,
-	[tree_names] varchar(767) NOT NULL,
-	[tree_name] nvarchar(200) NOT NULL,
-	[status] char(1) DEFAULT '0' NOT NULL,
-	[create_by] varchar(64) NOT NULL,
-	[create_date] datetime NOT NULL,
-	[update_by] varchar(64) NOT NULL,
-	[update_date] datetime NOT NULL,
-	[remarks] nvarchar(500),
-	PRIMARY KEY ([tree_code])
-);
-
-
-
diff --git a/web/src/main/resources/db/create/mysql/test.sql b/web/src/main/resources/db/create/mysql/test.sql
deleted file mode 100644
index 06c78075..00000000
--- a/web/src/main/resources/db/create/mysql/test.sql
+++ /dev/null
@@ -1,76 +0,0 @@
-SET SESSION FOREIGN_KEY_CHECKS=0;
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL COMMENT '缂栧彿',
-	test_input varchar(200) COMMENT '鍗曡鏂囨湰',
-	test_textarea varchar(200) COMMENT '澶氳鏂囨湰',
-	test_select varchar(10) COMMENT '涓嬫媺妗�',
-	test_select_multiple varchar(200) COMMENT '涓嬫媺澶氶��',
-	test_radio varchar(10) COMMENT '鍗曢�夋',
-	test_checkbox varchar(200) COMMENT '澶嶉�夋',
-	test_date datetime COMMENT '鏃ユ湡閫夋嫨',
-	test_datetime datetime COMMENT '鏃ユ湡鏃堕棿',
-	test_user_code varchar(64) COMMENT '鐢ㄦ埛閫夋嫨',
-	test_office_code varchar(64) COMMENT '鏈烘瀯閫夋嫨',
-	test_area_code varchar(64) COMMENT '鍖哄煙閫夋嫨',
-	test_area_name varchar(100) COMMENT '鍖哄煙鍚嶇О',
-	status char(1) DEFAULT '0' NOT NULL COMMENT '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�',
-	create_by varchar(64) NOT NULL COMMENT '鍒涘缓鑰�',
-	create_date datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
-	update_by varchar(64) NOT NULL COMMENT '鏇存柊鑰�',
-	update_date datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
-	remarks varchar(500) COMMENT '澶囨敞淇℃伅',
-	PRIMARY KEY (id)
-) COMMENT = '娴嬭瘯鏁版嵁';
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL COMMENT '缂栧彿',
-	test_sort int COMMENT '鎺掑簭鍙�',
-	test_data_id varchar(64) COMMENT '鐖惰〃涓婚敭',
-	test_input varchar(200) COMMENT '鍗曡鏂囨湰',
-	test_textarea varchar(200) COMMENT '澶氳鏂囨湰',
-	test_select varchar(10) COMMENT '涓嬫媺妗�',
-	test_select_multiple varchar(200) COMMENT '涓嬫媺澶氶��',
-	test_radio varchar(10) COMMENT '鍗曢�夋',
-	test_checkbox varchar(200) COMMENT '澶嶉�夋',
-	test_date datetime COMMENT '鏃ユ湡閫夋嫨',
-	test_datetime datetime COMMENT '鏃ユ湡鏃堕棿',
-	test_user_code varchar(64) COMMENT '鐢ㄦ埛閫夋嫨',
-	test_office_code varchar(64) COMMENT '鏈烘瀯閫夋嫨',
-	test_area_code varchar(64) COMMENT '鍖哄煙閫夋嫨',
-	test_area_name varchar(100) COMMENT '鍖哄煙鍚嶇О',
-	PRIMARY KEY (id)
-) COMMENT = '娴嬭瘯鏁版嵁瀛愯〃';
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL COMMENT '鑺傜偣缂栫爜',
-	parent_code varchar(64) NOT NULL COMMENT '鐖剁骇缂栧彿',
-	parent_codes varchar(767) NOT NULL COMMENT '鎵�鏈夌埗绾х紪鍙�',
-	tree_sort decimal(10) NOT NULL COMMENT '鎺掑簭鍙凤紙鍗囧簭锛�',
-	tree_sorts varchar(767) NOT NULL COMMENT '鎵�鏈夋帓搴忓彿',
-	tree_leaf char(1) NOT NULL COMMENT '鏄惁鏈�鏈骇',
-	tree_level decimal(4) NOT NULL COMMENT '灞傛绾у埆',
-	tree_names varchar(767) NOT NULL COMMENT '鍏ㄨ妭鐐瑰悕',
-	tree_name varchar(200) NOT NULL COMMENT '鑺傜偣鍚嶇О',
-	status char(1) DEFAULT '0' NOT NULL COMMENT '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�',
-	create_by varchar(64) NOT NULL COMMENT '鍒涘缓鑰�',
-	create_date datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
-	update_by varchar(64) NOT NULL COMMENT '鏇存柊鑰�',
-	update_date datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
-	remarks varchar(500) COMMENT '澶囨敞淇℃伅',
-	PRIMARY KEY (tree_code)
-) COMMENT = '娴嬭瘯鏍戣〃';
-
-
-
diff --git a/web/src/main/resources/db/create/oracle/test.sql b/web/src/main/resources/db/create/oracle/test.sql
deleted file mode 100644
index 4308d8d3..00000000
--- a/web/src/main/resources/db/create/oracle/test.sql
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar2(64) NOT NULL,
-	test_input varchar2(200),
-	test_textarea nvarchar2(200),
-	test_select varchar2(10),
-	test_select_multiple varchar2(200),
-	test_radio varchar2(10),
-	test_checkbox varchar2(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar2(64),
-	test_office_code varchar2(64),
-	test_area_code varchar2(64),
-	test_area_name nvarchar2(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar2(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar2(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks nvarchar2(500),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar2(64) NOT NULL,
-	test_sort number(10,0),
-	test_data_id varchar2(64),
-	test_input varchar2(200),
-	test_textarea nvarchar2(200),
-	test_select varchar2(10),
-	test_select_multiple varchar2(200),
-	test_radio varchar2(10),
-	test_checkbox varchar2(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar2(64),
-	test_office_code varchar2(64),
-	test_area_code varchar2(64),
-	test_area_name nvarchar2(100),
-	PRIMARY KEY (id)
-);
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar2(64) NOT NULL,
-	parent_code varchar2(64) NOT NULL,
-	parent_codes varchar2(767) NOT NULL,
-	tree_sort number(10) NOT NULL,
-	tree_sorts varchar2(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level number(4) NOT NULL,
-	tree_names varchar2(767) NOT NULL,
-	tree_name nvarchar2(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar2(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar2(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks nvarchar2(500),
-	PRIMARY KEY (tree_code)
-);
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '娴嬭瘯鏁版嵁';
-COMMENT ON COLUMN test_data.id IS '缂栧彿';
-COMMENT ON COLUMN test_data.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON COLUMN test_data.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_data.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_data.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_data.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_data.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_data.remarks IS '澶囨敞淇℃伅';
-COMMENT ON TABLE test_data_child IS '娴嬭瘯鏁版嵁瀛愯〃';
-COMMENT ON COLUMN test_data_child.id IS '缂栧彿';
-COMMENT ON COLUMN test_data_child.test_sort IS '鎺掑簭鍙�';
-COMMENT ON COLUMN test_data_child.test_data_id IS '鐖惰〃涓婚敭';
-COMMENT ON COLUMN test_data_child.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data_child.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data_child.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data_child.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON TABLE test_tree IS '娴嬭瘯鏍戣〃';
-COMMENT ON COLUMN test_tree.tree_code IS '鑺傜偣缂栫爜';
-COMMENT ON COLUMN test_tree.parent_code IS '鐖剁骇缂栧彿';
-COMMENT ON COLUMN test_tree.parent_codes IS '鎵�鏈夌埗绾х紪鍙�';
-COMMENT ON COLUMN test_tree.tree_sort IS '鎺掑簭鍙凤紙鍗囧簭锛�';
-COMMENT ON COLUMN test_tree.tree_sorts IS '鎵�鏈夋帓搴忓彿';
-COMMENT ON COLUMN test_tree.tree_leaf IS '鏄惁鏈�鏈骇';
-COMMENT ON COLUMN test_tree.tree_level IS '灞傛绾у埆';
-COMMENT ON COLUMN test_tree.tree_names IS '鍏ㄨ妭鐐瑰悕';
-COMMENT ON COLUMN test_tree.tree_name IS '鑺傜偣鍚嶇О';
-COMMENT ON COLUMN test_tree.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_tree.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_tree.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_tree.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_tree.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_tree.remarks IS '澶囨敞淇℃伅';
-
-
-
diff --git a/web/src/main/resources/db/create/postgresql/test.sql b/web/src/main/resources/db/create/postgresql/test.sql
deleted file mode 100644
index 54758d68..00000000
--- a/web/src/main/resources/db/create/postgresql/test.sql
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
--- 娴嬭瘯鏁版嵁
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL,
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (id)
-) WITHOUT OIDS;
-
-
--- 娴嬭瘯鏁版嵁瀛愯〃
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL,
-	test_sort int,
-	test_data_id varchar(64),
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	PRIMARY KEY (id)
-) WITHOUT OIDS;
-
-
--- 娴嬭瘯鏍戣〃
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	tree_name varchar(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (tree_code)
-) WITHOUT OIDS;
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '娴嬭瘯鏁版嵁';
-COMMENT ON COLUMN test_data.id IS '缂栧彿';
-COMMENT ON COLUMN test_data.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON COLUMN test_data.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_data.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_data.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_data.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_data.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_data.remarks IS '澶囨敞淇℃伅';
-COMMENT ON TABLE test_data_child IS '娴嬭瘯鏁版嵁瀛愯〃';
-COMMENT ON COLUMN test_data_child.id IS '缂栧彿';
-COMMENT ON COLUMN test_data_child.test_sort IS '鎺掑簭鍙�';
-COMMENT ON COLUMN test_data_child.test_data_id IS '鐖惰〃涓婚敭';
-COMMENT ON COLUMN test_data_child.test_input IS '鍗曡鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_textarea IS '澶氳鏂囨湰';
-COMMENT ON COLUMN test_data_child.test_select IS '涓嬫媺妗�';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '涓嬫媺澶氶��';
-COMMENT ON COLUMN test_data_child.test_radio IS '鍗曢�夋';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '澶嶉�夋';
-COMMENT ON COLUMN test_data_child.test_date IS '鏃ユ湡閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_datetime IS '鏃ユ湡鏃堕棿';
-COMMENT ON COLUMN test_data_child.test_user_code IS '鐢ㄦ埛閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_office_code IS '鏈烘瀯閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_code IS '鍖哄煙閫夋嫨';
-COMMENT ON COLUMN test_data_child.test_area_name IS '鍖哄煙鍚嶇О';
-COMMENT ON TABLE test_tree IS '娴嬭瘯鏍戣〃';
-COMMENT ON COLUMN test_tree.tree_code IS '鑺傜偣缂栫爜';
-COMMENT ON COLUMN test_tree.parent_code IS '鐖剁骇缂栧彿';
-COMMENT ON COLUMN test_tree.parent_codes IS '鎵�鏈夌埗绾х紪鍙�';
-COMMENT ON COLUMN test_tree.tree_sort IS '鎺掑簭鍙凤紙鍗囧簭锛�';
-COMMENT ON COLUMN test_tree.tree_sorts IS '鎵�鏈夋帓搴忓彿';
-COMMENT ON COLUMN test_tree.tree_leaf IS '鏄惁鏈�鏈骇';
-COMMENT ON COLUMN test_tree.tree_level IS '灞傛绾у埆';
-COMMENT ON COLUMN test_tree.tree_names IS '鍏ㄨ妭鐐瑰悕';
-COMMENT ON COLUMN test_tree.tree_name IS '鑺傜偣鍚嶇О';
-COMMENT ON COLUMN test_tree.status IS '鐘舵�侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛�';
-COMMENT ON COLUMN test_tree.create_by IS '鍒涘缓鑰�';
-COMMENT ON COLUMN test_tree.create_date IS '鍒涘缓鏃堕棿';
-COMMENT ON COLUMN test_tree.update_by IS '鏇存柊鑰�';
-COMMENT ON COLUMN test_tree.update_date IS '鏇存柊鏃堕棿';
-COMMENT ON COLUMN test_tree.remarks IS '澶囨敞淇℃伅';
-
-
-
diff --git a/web/src/main/resources/mappings/modules/test/TestDataChildDao.xml b/web/src/main/resources/mappings/modules/test/TestDataChildDao.xml
deleted file mode 100644
index badbe182..00000000
--- a/web/src/main/resources/mappings/modules/test/TestDataChildDao.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jeesite.modules.test.dao.TestDataChildDao">
-	
-	<!-- 鏌ヨ鏁版嵁
-	<select id="findList" resultType="TestDataChild">
-		SELECT ${sqlMap.column.toSql()}
-		FROM ${sqlMap.table.toSql()}
-		<where>
-			${sqlMap.where.toSql()}
-		</where>
-		ORDER BY ${sqlMap.order.toSql()}
-	</select> -->
-	
-</mapper>
\ No newline at end of file
diff --git a/web/src/main/resources/mappings/modules/test/TestDataDao.xml b/web/src/main/resources/mappings/modules/test/TestDataDao.xml
deleted file mode 100644
index c21f5521..00000000
--- a/web/src/main/resources/mappings/modules/test/TestDataDao.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jeesite.modules.test.dao.TestDataDao">
-	
-	<!-- 鏌ヨ鏁版嵁
-	<select id="findList" resultType="TestData">
-		SELECT ${sqlMap.column.toSql()}
-		FROM ${sqlMap.table.toSql()}
-		<where>
-			${sqlMap.where.toSql()}
-		</where>
-		ORDER BY ${sqlMap.order.toSql()}
-	</select> -->
-	
-	<!-- 婕旂ずMap鍙傛暟鍜岃繑鍥炲�硷紝鏀寔鍒嗛〉 -->
-	<select id="findListForMap" resultType="map">
-		SELECT * FROM test_data a
-		<where>
-			<if test="testInput != null and testInput != ''">
-				AND a.test_input = #{testInput}
-			</if>
-		</where>
-		<if test="page != null and page.orderBy != null and page.orderBy != ''">
-			ORDER BY ${page.orderBy}
-		</if>
-	</select>
-	
-</mapper>
\ No newline at end of file
diff --git a/web/src/main/resources/mappings/modules/test/TestTreeDao.xml b/web/src/main/resources/mappings/modules/test/TestTreeDao.xml
deleted file mode 100644
index 7486b49e..00000000
--- a/web/src/main/resources/mappings/modules/test/TestTreeDao.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jeesite.modules.test.dao.TestTreeDao">
-	
-	<!-- 鏌ヨ鏁版嵁
-	<select id="findList" resultType="TestTree">
-		SELECT ${sqlMap.column.toSql()}
-		FROM ${sqlMap.table.toSql()}
-		<where>
-			${sqlMap.where.toSql()}
-		</where>
-		ORDER BY ${sqlMap.order.toSql()}
-	</select> -->
-	
-</mapper>
\ No newline at end of file
diff --git a/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html
deleted file mode 100644
index 360dabec..00000000
--- a/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html
+++ /dev/null
@@ -1,264 +0,0 @@
-<% layout('/layouts/default.html', {title: '缂栬緫琛ㄦ牸澶氳缂栬緫', libs: ['dataGrid','validate']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header">
-			<div class="box-title">
-				<i class="fa icon-notebook"></i> 缂栬緫琛ㄦ牸澶氳缂栬緫
-			</div>
-			<div class="box-tools pull-right">
-				<a href="#" class="btn btn-default" id="btnSearch" title="鏌ヨ"><i class="fa fa-filter"></i> 鏌ヨ</a>
-				<a href="#" id="dataGridAddRowBtn" class="btn btn-default"><i class="fa fa-plus"></i> 澧炶</a>
-				<a href="#" id="btnGetData" class="btn btn-default"><i class="fa fa-hand-lizard-o"></i> 鑾峰彇琛ㄦ牸鏁版嵁</a>
-			</div>
-		</div>
-		<div class="box-body">
-			<#form:form id="searchForm" model="${testData}" action="${ctx}/test/testData/listData" method="post" class="form-inline hide"
-					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<div class="form-group">
-					<label class="control-label">鍗曡鏂囨湰锛�</label>
-					<div class="control-inline">
-						<#form:input path="testInput" maxlength="200" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">澶氳鏂囨湰锛�</label>
-					<div class="control-inline">
-						<#form:input path="testTextarea" maxlength="200" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">涓嬫媺妗嗭細</label>
-					<div class="control-inline width-120">
-						<#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">涓嬫媺澶氶�夛細</label>
-					<div class="control-inline width-120">
-						<#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">鍗曢�夋锛�</label>
-					<div class="control-inline">
-						<#form:radio path="testRadio" dictType="sys_menu_type" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">澶嶉�夋锛�</label>
-					<div class="control-inline">
-						<#form:checkbox path="testCheckbox" dictType="sys_menu_type" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">鏃ユ湡閫夋嫨锛�</label>
-					<div class="control-inline">
-						<#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date"
-							dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.click()"/>
-						&nbsp;-&nbsp;
-						<#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date"
-							dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">鏃ユ湡鏃堕棿锛�</label>
-					<div class="control-inline">
-						<#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
-							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.click()"/>
-						&nbsp;-&nbsp;
-						<#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
-							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">鐢ㄦ埛閫夋嫨锛�</label>
-					<div class="control-inline width-120" >
-						<#form:treeselect id="testUser" title="鐢ㄦ埛閫夋嫨"
-							path="testUser.userCode" labelPath="testUser.userName" 
-							url="${ctx}/sys/office/treeData?isLoadUser=true" allowClear="true"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">鏈烘瀯閫夋嫨锛�</label>
-					<div class="control-inline width-120" >
-						<#form:treeselect id="testOffice" title="鏈烘瀯閫夋嫨"
-							path="testOffice.officeCode" labelPath="testOffice.officeName" 
-							url="${ctx}/sys/office/treeData" allowClear="true"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">鍖哄煙閫夋嫨锛�</label>
-					<div class="control-inline width-120" >
-						<#form:treeselect id="testAreaCode" title="鍖哄煙閫夋嫨"
-							path="testAreaCode" labelPath="testAreaName" 
-							url="${ctx}/sys/area/treeData" allowClear="true"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">鐘舵�侊細</label>
-					<div class="control-inline width-120">
-						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">澶囨敞淇℃伅锛�</label>
-					<div class="control-inline">
-						<#form:input path="remarks" maxlength="500" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<button type="submit" class="btn btn-primary btn-sm"><i class="glyphicon glyphicon-search"></i> ${text('鏌ヨ')}</button>
-					<button type="reset" class="btn btn-default btn-sm isQuick"><i class="glyphicon glyphicon-repeat"></i> ${text('閲嶇疆')}</button>
-				</div>
-			</#form:form>
-			<#form:form id="inputForm" model="${testData}" action="${ctx}/test/testData/save" method="post" class="form-horizontal table-form">
-				<table id="dataGrid"></table>
-				<div id="dataGridPage"></div>
-			</#form:form>
-		</div>
-	</div>
-</div>
-<% } %>
-<script>
-//# // 鍒濆鍖朌ataGrid瀵硅薄
-$('#dataGrid').dataGrid({
-	searchForm: $("#searchForm"),
-	// 璁剧疆鏁版嵁琛ㄦ牸鍒�
-	columnModel: [
-		{header:'鐘舵��', name:'status', editable:true, hidden:true, unformat: function(val, obj, cell){return $('#'+obj.rowId+'_'+obj.colModel.name, cell).val();}},
-		{header:'涓婚敭', name:'id', editable:true, hidden:true, unformat: function(val, obj, cell){return $('#'+obj.rowId+'_'+obj.colModel.name, cell).val();}},
-		{header:'鍗曡鏂囨湰', name:'testInput', width:150, editable:true, edittype:'text', editoptions:{'maxlength':'200', 'class':'form-control'}, unformat: function(val, obj, cell){return $('#'+obj.rowId+'_'+obj.colModel.name, cell).val();}},
-		{header:'澶氳鏂囨湰', name:'testTextarea', width:150, editable:true, edittype:'textarea', editoptions:{'maxlength':'200', 'class':'form-control', 'rows':'1'}, unformat: function(val, obj, cell){return $('#'+obj.rowId+'_'+obj.colModel.name, cell).val();}},
-		{header:'涓嬫媺妗�', name:'testSelect', width:100, 
-			editable:true, edittype:'select', editoptions:{'class':'form-control',
-				items: $.merge([{dictLabel:'&nbsp;',dictValue:''}], "#{@DictUtils.getDictListJson('sys_menu_type')}"),
-				itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){
-					js.select2(element).on("change",function(){$(this).resetValid()});
-				}
-			}, unformat: function(val, obj, cell){return $('#'+obj.rowId+'_'+obj.colModel.name, cell).val();}
-		},
-// 		{header:'涓嬫媺澶氶��', name:'testSelectMultiple', width:100, 
-// 			editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control',
-// 				items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"),
-// 				itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){
-// 					js.select2(element).on("change",function(){$(this).resetValid()});
-// 				}
-// 			}, unformat: function(val, obj, cell){return $('#'+obj.rowId+'_'+obj.colModel.name, cell).val();}
-// 		},
-		{header:'鏃ユ湡閫夋嫨', name:'testDate', width:150, 
-			formatter:'date', formatoptions:{srcformat:'Y-m-d H:i:s',newformat:'Y-m-d'},
-			editable:true, edittype:'text', editoptions:{'class':'form-control laydate required', 'readonly':'true',
-				dataInit: function(element){
-					laydate.render({elem:element, type:'date', format:'yyyy-MM-dd'});
-				}
-			}, unformat: function(val, obj, cell){return $('#'+obj.rowId+'_'+obj.colModel.name, cell).val();}
-		},
-		{header:'鏃ユ湡鏃堕棿', name:'testDatetime', width:150, 
-			formatter:'date', formatoptions:{srcformat:'Y-m-d H:i:s',newformat:'Y-m-d H:i:s'},
-			editable:true, edittype:'text', editoptions:{'class':'form-control laydate required', 'readonly':'true',
-				dataInit: function(element){
-					laydate.render({elem:element, type:'datetime', format:'yyyy-MM-dd HH:mm'});
-				}
-			}, unformat: function(val, obj, cell){return $('#'+obj.rowId+'_'+obj.colModel.name, cell).val();}
-		},
-		{header:'鐢ㄦ埛閫夋嫨', name:'testUser', width:150,
-			formatter: function(val, obj, row, act){
-				return js.val(row, 'testUser.userCode')+'|'+js.val(row, 'testUser.userName');
-			}, editable: true, edittype: "custom", editoptions: {
-				custom_element: function(val, editOptions) {
-					return js.template('treeselectTpl', {
-						id: 'user_'+editOptions.id, title: '鐢ㄦ埛閫夋嫨', 
-						name: 'testUser.userCode', value: val.split('|')[0], 
-						labelName: 'testUser.userName', labelValue: val.split('|')[1],
-						url: '${ctx}/sys/office/treeData?isLoadUser=true', cssClass: ''
-					});
-				}
-			}, unformat: function(val, obj, cell){return $('#user_'+obj.rowId+'_'+obj.colModel.name+'Code', cell).val();}
-		},
-		{header:'鏈烘瀯閫夋嫨', name:'testOffice', width:150,
-			formatter: function(val, obj, row, act){
-				return js.val(row, 'testOffice.officeCode')+'|'+js.val(row, 'testOffice.officeName');
-			}, editable: true, edittype: "custom", editoptions: {
-				custom_element: function(val, editOptions) {
-					return js.template('treeselectTpl', {
-						id: 'office_'+editOptions.id, title: '鏈烘瀯閫夋嫨', 
-						name: 'testOffice.officeCode', value: val.split('|')[0], 
-						labelName: 'testOffice.officeName', labelValue: val.split('|')[1],
-						url: '${ctx}/sys/office/treeData?officeTypes=1,2', cssClass: ''
-					});
-				}
-			}, unformat: function(val, obj, cell){return $('#office_'+obj.rowId+'_'+obj.colModel.name+'Code', cell).val();}
-		},
-		{header:'鍖哄煙閫夋嫨', name:'testAreaCode', width:150,
-			formatter: function(val, obj, row, act){
-				return js.val(row, 'testAreaCode')+'|'+js.val(row, 'testAreaName');
-			}, editable: true, edittype: "custom", editoptions: {
-				custom_element: function(val, editOptions) {
-					return js.template('treeselectTpl', {
-						id: 'area_'+editOptions.id, title: '鍖哄煙閫夋嫨', 
-						name: 'testAreaCode', value: val.split('|')[0], 
-						labelName: 'testAreaName', labelValue: val.split('|')[1],
-						url: '${ctx}/sys/area/treeData', cssClass: ''
-					});
-				}
-			}, unformat: function(val, obj, cell){return $('#area_'+obj.rowId+'_'+obj.colModel.name+'Code', cell).val();}
-		},
-		{header:'鍒楄〃閫夋嫨', name:'testListSelect', width:150,
-			formatter: function(val, obj, row, act){
-				return js.val(row, 'testListSelectCode')+'|'+js.val(row, 'testListSelectName');
-			}, editable: true, edittype: "custom", editoptions: {
-				custom_element: function(val, editOptions) {
-					return js.template('listselectTpl', {
-						id: 'user_'+editOptions.id, title: '鐢ㄦ埛閫夋嫨', 
-						name: 'testListSelectCode', value: val.split('|')[0], 
-						labelName: 'testListSelectName', labelValue: val.split('|')[1],
-						url: '${ctx}/sys/empUser/empUserSelect', 
-						itemCode: 'userCode', itemName: 'userName',
-						cssClass: ''
-					});
-				}
-			}, unformat: function(val, obj, cell){return $('#user_'+obj.rowId+'_'+obj.colModel.name+'Code', cell).val();}
-		},
-		{header:'鎿嶄綔', name:'actions', width:80, sortable:false, fixed:true, formatter: function(val, obj, row, act){
-			var actions = [];
-			if (val == 'new'){
-				actions.push('<a href="#" onclick="js.confirm(\'浣犵‘璁よ鍒犻櫎杩欐潯鏁版嵁鍚楋紵\', function(){$(\'#dataGrid\').dataGrid(\'delRowData\',\''+obj.rowId+'\')});return false;"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			}else{
-				actions.push('<a href="#" onclick="js.confirm(\'浣犵‘璁よ鍒犻櫎杩欐潯鏁版嵁鍚楋紵\', function(){$(\'#dataGrid\').dataGrid(\'setRowData\',\''+obj.rowId+'\',null,{display:\'none\'})});$(\'#'+obj.rowId+'_status\').val(\''+Global.STATUS_DELETE+'\');return false;"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			}
-			return actions.join('');
-		}, editoptions: {defaultValue: 'new'}, unformat: function(val, obj, cell){return '';}}
-	],
-	
-	// 缂栬緫琛ㄦ牸鍙傛暟
-	editGrid: true,				// 鏄惁鏄紪杈戣〃鏍�
-	editGridInitRowNum: 1,		// 缂栬緫琛ㄦ牸鐨勫垵濮嬪寲鏂板琛屾暟
-	editGridAddRowBtn: $('#dataGridAddRowBtn'),	// 瀛愯〃澧炶鎸夐挳
-	editGridAddRowInitData: {id: '', status: Global.STATUS_NORMAL},	// 鏂板琛岀殑鏃跺�欏垵濮嬪寲鐨勬暟鎹�
-	
-	// 缂栬緫琛ㄦ牸鐨勬彁浜ゆ暟鎹弬鏁�
-	editGridInputFormListName: 'testDataChildList', // 鎻愪氦鐨勬暟鎹垪琛ㄥ悕
-	editGridInputFormListAttrs: 'status,id,testSort,testData.id,testInput,testTextarea,testSelect,testSelectMultiple,testRadio,testCheckbox,testDate,testDatetime,testUser.userCode,testOffice.officeCode,testAreaCode,testAreaName,', // 鎻愪氦鏁版嵁鍒楄〃鐨勫睘鎬у瓧娈�
-	
-	//# // 鍔犺浇鎴愬姛鍚庢墽琛屼簨浠�
-	ajaxSuccess: function(data){
-		
-	}
-});
-$('#btnGetData').click(function(){
-	var data = $('#dataGrid').dataGrid('getRowData');
-	log(data)
-	js.showMessage('璇锋寜 F12 鎵撳紑鎺у埗鍙帮紝鏌ョ湅鏁版嵁');
-});
-</script>
-<script id="treeselectTpl" type="text/template">//<!--<div>
-<#form:treeselect id="{{d.id}}" title="{{d.title}}" name="{{d.name}}" value="{{d.value}}"
-	labelName="{{d.labelName}}" labelValue="{{d.labelValue}}" url="{{d.url}}"
-	class="{{d.cssClass}}" btnClass="btn-sm" allowClear="true"/>
-</div>//--></script>
-<script id="listselectTpl" type="text/template">//<!--<div>
-<#form:listselect id="{{d.id}}" title="{{d.title}}" name="{{d.name}}" value="{{d.value}}"
-	labelName="{{d.labelName}}" labelValue="{{d.labelValue}}" url="{{d.url}}"
-	itemCode="{{d.itemCode}}" itemName="{{d.itemName}}"
-	class="{{d.cssClass}}" btnClass="btn-sm" allowClear="true"/>
-</div>//--></script>
\ No newline at end of file
diff --git a/web/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html
deleted file mode 100644
index 4659800f..00000000
--- a/web/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<% layout('/layouts/default.html', {title: '澶氳〃鏍艰仈鍔ㄧず渚�', libs: ['layout', 'dataGrid']}){ %>
-<div class="ui-layout-north">
-	<div class="main-content">
-		<div class="box box-main">
-			<div class="box-header">
-				<div class="box-title">
-					<i class="fa icon-trophy"></i> ${text('宀椾綅鍒楄〃')}锛堝琛ㄦ牸鑱斿姩绀轰緥锛�
-				</div>
-			</div>
-			<div class="ui-layout-content">
-				<#form:form id="searchForm" model="${post!}" action="${ctx}/sys/post/listData" method="post" class="form-inline hide"
-						data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize!3}"
-						data-order-by="${parameter.orderBy!'post_code desc'}">
-					<div class="form-group">
-						<button type="submit" class="btn btn-primary btn-sm"><i class="glyphicon glyphicon-search"></i> ${text('鏌ヨ')}</button>
-						<button type="reset" class="btn btn-default btn-sm isQuick"><i class="glyphicon glyphicon-repeat"></i> ${text('閲嶇疆')}</button>
-					</div>
-				</#form:form>
-				<table id="dataGrid"></table>
-				<div id="dataGridPage"></div>
-			</div>
-		</div>
-	</div>
-</div>
-<div class="ui-layout-center">
-	<div class="main-content">
-		<div class="box box-main">
-			<div class="box-header">
-				<div class="box-title">
-					<i class="fa icon-user"></i> ${text('鐢ㄦ埛鍒楄〃')}锛堢偣鍑诲矖浣嶆煡璇㈠搴旂敤鎴凤級
-				</div>
-			</div>
-			<div class="ui-layout-content">
-				<#form:form id="searchForm2" model="${empUser!}" action="${ctx}/sys/empUser/listData" method="post" class="form-inline hide"
-						data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize!6}"
-						data-order-by="${parameter.orderBy}">
-					<div class="form-group">
-						<label class="control-label">${text('宀椾綅')}锛�</label>
-						<div class="control-inline width-90">
-							<#form:input name="employee.postCode" id="postCode" class="form-control"/>
-						</div>
-					</div>
-				</#form:form>
-				<table id="dataGrid2"></table>
-				<div id="dataGrid2Page"></div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<% } %>
-<script>
-//# // 鍒濆鍖栧竷灞�
-$('body').layout({
-	north__size: 300,
-	onresize: function(){
-		$(window).resize();
-	}
-});
-//# // 鍒濆鍖朌ataGrid瀵硅薄
-$('#dataGrid').dataGrid({
-	searchForm: $("#searchForm"),
-	dataGridPage: $('#dataGridPage'),
-	autoGridHeight: function(){
-		return $('#searchForm').parent().height() - $('#dataGridPage').height() - 58;
-	},
-	columnModel: [
-		{header:'${text("宀椾綅鍚嶇О")}', name:'postName', index:'a.post_name', width:200, align:"center"},
-		{header:'${text("宀椾綅浠ｇ爜")}', name:'postCode', index:'a.post_code', width:200, align:"center"},
-		{header:'${text("鎺掑簭鍙�")}', name:'postSort', index:'a.post_sort', width:80, align:"center"},
-		{header:'${text("宀椾綅鍒嗙被")}', name:'postType', index:'a.post_type', width:100, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_post_type')}", val, '鏈煡', true);
-		}},
-		{header:'${text("鏇存柊鏃堕棿")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
-		{header:'${text("澶囨敞淇℃伅")}', name:'remarks', index:'a.remarks', width:200, align:"left"},
-		{header:'${text("鐘舵��")}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_status')}", val, '鏈煡', true);
-		}}
-	],
-	onSelectRow: function(id, isSelect, event){
-		$('#postCode').val(id);
-		$('#dataGrid2').dataGrid('refresh');
-	},
-	//# // 鍔犺浇鎴愬姛鍚庢墽琛屼簨浠�
-	ajaxSuccess: function(data){
-		
-	}
-});
-//# // 鍒濆鍖朌ataGrid瀵硅薄
-$('#dataGrid2').dataGrid({
-	searchForm: $("#searchForm2"),
-	dataGridPage: $('#dataGrid2Page'),
-	autoGridHeight: function(){
-		return $('#searchForm2').parent().height() - $('#dataGrid2Page').height() - 58;
-	},
-	columnModel: [
-		{header:'${text("鐧诲綍璐﹀彿")}', name:'loginCode', index:'a.login_code', width:200, align:"center"},
-		{header:'${text("鐢ㄦ埛鏄电О")}', name:'userName', index:'a.user_name', width:200, align:"center"},
-		{header:'${text("鍛樺伐濮撳悕")}', name:'refName', index:'a.ref_name', width:200, align:"center"},
-		{header:'${text("褰掑睘鏈烘瀯")}', name:'employee.office.officeName', index:'o.office_name', width:200, align:"center"},
-		{header:'${text("褰掑睘鍏徃")}', name:'employee.company.companyName', index:'c.company_name', width:200, align:"center"},
-		{header:'${text("鐢靛瓙閭")}', name:'email', index:'a.email', width:200, align:"center"},
-		{header:'${text("鎵嬫満鍙风爜")}', name:'mobile', index:'a.mobile', width:200, align:"center"},
-		{header:'${text("鍔炲叕鐢佃瘽")}', name:'phone', index:'a.phone', width:200, align:"center"},
-		{header:'${text("鏇存柊鏃堕棿")}', name:'updateDate', index:'a.update_date', width:200, align:"center"},
-		{header:'${text("鐘舵��")}', name:'status', index:'a.status', width:140, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_status')}", val, '鏈煡', true);
-		}}
-	],
-	//# // 鍔犺浇鎴愬姛鍚庢墽琛屼簨浠�
-	ajaxSuccess: function(data){
-		
-	}
-});
-</script>
\ No newline at end of file
diff --git a/web/src/main/resources/views/modules/demo/demoFormEditForm.html b/web/src/main/resources/views/modules/demo/demoFormEditForm.html
deleted file mode 100644
index 8cce16f8..00000000
--- a/web/src/main/resources/views/modules/demo/demoFormEditForm.html
+++ /dev/null
@@ -1,501 +0,0 @@
-<% layout('/layouts/default.html', {title: '缁勪欢搴旂敤瀹炰緥', libs: ['validate','fileupload','ueditor','dataGrid','inputmask']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header with-border">
-			<div class="box-title">
-				<i class="fa icon-notebook"></i> 缁勪欢搴旂敤瀹炰緥
-			</div>
-			<div class="box-tools pull-right hide">
-				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-			</div>
-		</div>
-		<#form:form id="inputForm" model="${testData}" action="${ctx}/test/testData/save" method="post" class="form-horizontal">
-			<div class="box-body">
-				<div class="form-unit">鍩烘湰淇℃伅</div>
-				<#form:hidden path="id"/>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2" title="">
-								<span class="required hide">*</span> 鍗曡鏂囨湰锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-10">
-								<#form:input path="testInput" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2" title="">
-								<span class="required hide">*</span> 澶氳鏂囨湰锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-10">
-								<#form:textarea path="testTextarea" rows="4" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 涓嬫媺妗嗭細<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control" />
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 涓嬫媺澶氶�夛細<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control" />
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鍗曢�夋锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:radio path="testRadio" dictType="sys_menu_type" class="form-control" />
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 澶嶉�夋锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:checkbox path="testCheckbox" dictType="sys_menu_type" class="form-control" />
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鏃ユ湡閫夋嫨锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="testDate" readonly="true" maxlength="20" class="form-control laydate "
-									dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鏃ユ湡鏃堕棿锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="testDatetime" readonly="true" maxlength="20" class="form-control laydate "
-									dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 閲戦鏍煎紡锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<div class="input-group">
-									<span class="input-group-addon"><i class="fa fa-fw fa-rmb"></i></span>
-									<#form:input path="testInput_money" maxlength="200" class="form-control inputmask"
-											data-inputmask-alias="money" data-inputmask="'digits':'2'"/>
-									<span class="input-group-addon">(鍗冨垎浣嶏紝鍙冲榻愶紝淇濈暀2浣嶅皬鏁�)</span>
-				                </div>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鐢靛瓙閭锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<div class="input-group">
-									<span class="input-group-addon"><i class="fa fa-fw fa-envelope"></i></span>
-									<#form:input path="testInput_regex" maxlength="200" class="form-control inputmask"
-											data-inputmask-regex="[a-zA-Z0-9._%-]+@[a-zA-Z0-9-]+\\.[a-zA-Z]{2,4}"/>
-									<span class="input-group-addon">(姝ｅ垯琛ㄨ揪寮�)</span>
-				                </div>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鐢ㄦ埛閫夋嫨锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:treeselect id="testUser" title="鐢ㄦ埛閫夋嫨"
-									path="testUser.userCode" labelPath="testUser.userName"
-									url="${ctx}/sys/office/treeData?isLoadUser=true"
-									class="" allowClear="true"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鐢ㄦ埛澶氶�夛細<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:treeselect id="testUser2" title="鐢ㄦ埛閫夋嫨"
-									path="testUser.userCode" labelPath="testUser.userName"
-									url="${ctx}/sys/office/treeData?isLoadUser=true"
-									class="" allowClear="true" checkbox="true"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鐢ㄦ埛鍒楄〃閫夋嫨锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:listselect id="testUser3" title="鐢ㄦ埛閫夋嫨"
-								    url="${ctx}/sys/empUser/empUserSelect" allowClear="false" 
-								    checkbox="false" itemCode="userCode" itemName="userName"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鐢ㄦ埛鍒楄〃澶氶�夛細<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:listselect id="testUser4" title="鐢ㄦ埛閫夋嫨"
-								    url="${ctx}/sys/empUser/empUserSelect" allowClear="false" 
-								    checkbox="true" itemCode="userCode" itemName="userName"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鍩庡競閫夋嫨锛堝紓姝ワ級锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:treeselect id="testAreaCode" title="鍖哄煙閫夋嫨"
-									path="testAreaCode" labelPath="testAreaName"
-									url="${ctx}/sys/area/treeData?parentCode=0"
-									class="" allowClear="true" returnFullName="true"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鏈烘瀯閫夋嫨锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:treeselect id="testOffice" title="鏈烘瀯閫夋嫨"
-									path="testOffice.officeCode" labelPath="testOffice.officeName"
-									url="${ctx}/sys/office/treeData"
-									class="" allowClear="true"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鍩庡競閫夋嫨锛堣仈鍔級锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<div class="input-group" id="cascadeSelect"></div>
-								<script src="${ctxStatic}/jquery-plugins/jquery.cascadeSelect.js?${_version}"></script>
-								<script type="text/javascript">
-								$(function(){
-									js.ajaxSubmit(ctx + '/sys/area/treeData', function(data){
-										$("#cascadeSelect").cascadeSelect({
-										    data: data, cssStyle: 'width:150px',
-										    change: function(vals, names){
-										    	$('#areaSelectValue').val(vals.join(',') + ' | ' + names.join('/'))
-										    }
-										})
-									});
-								});
-								</script>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> 鑱斿姩閫夋嫨缁撴灉锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="areaSelectValue" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2" title="">
-								<span class="required hide">*</span> 澶囨敞淇℃伅锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-10">
-								<#form:ueditor path="remarks" maxlength="10000" height="200" class=""
-									simpleToolbars="true" readonly="false" outline="false"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2">鍥剧墖涓婁紶锛�</label>
-							<div class="col-sm-10">
-								<#form:fileupload id="uploadImage" bizKey="${testData.id}" bizType="testData_image"
-									uploadType="image" class="" readonly="false" preview="true"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2">杩斿洖璺緞锛�</label>
-							<div class="col-sm-10">
-								<#form:fileupload id="uploadImage2" returnPath="true"
-									filePathInputId="uploadImage2Path" fileNameInputId="uploadImage2Name"
-									uploadType="image" readonly="false" preview="true" maxUploadNum="3" isMini="false"/>
-								<#form:input name="uploadImage2Path" value="/js/userfiles/fileupload/201812/1073024549485039616.png|/js/userfiles/fileupload/201812/1073043095867133952.png" class="form-control"/>
-								<#form:input name="uploadImage2Name" value="0 (1).png|0 (2).png" class="form-control"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2">闄勪欢涓婁紶锛�</label>
-							<div class="col-sm-10">
-								<#form:fileupload id="uploadFile" bizKey="${testData.id}" bizType="testData_file"
-									uploadType="all" class="" readonly="false" preview="true"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="form-unit">娴嬭瘯鏁版嵁瀛愯〃</div>
-				<div class="form-unit-wrap table-form">
-					<table id="testDataChildDataGrid"></table>
-					<% if (hasPermi('test:testData:edit')){ %>
-						<a href="#" id="testDataChildDataGridAddRowBtn" class="btn btn-primary btn-sm mt10 mb10"><i class="fa fa-plus"></i> 澧炶</a>
-					<% } %>
-				</div>
-			</div>
-			<div class="box-footer">
-				<div class="row">
-					<div class="col-sm-offset-2 col-sm-10">
-						<% if (hasPermi('test:testData:edit')){ %>
-							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> 淇� 瀛�</button>&nbsp;
-						<% } %>
-						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> 鍏� 闂�</button>
-					</div>
-				</div>
-			</div>
-		</#form:form>
-	</div>
-</div>
-<% } %>
-<script>
-//鍒濆鍖栨祴璇曟暟鎹瓙琛―ataGrid瀵硅薄
-$('#testDataChildDataGrid').dataGrid({
-
-	data: "#{toJson(testData.testDataChildList)}",
-	datatype: 'local', // 璁剧疆鏈湴鏁版嵁
-	autoGridHeight: function(){return 'auto'}, // 璁剧疆鑷姩楂樺害
-	
-	// 璁剧疆鏁版嵁琛ㄦ牸鍒�
-	columnModel: [
-		{header:'鐘舵��', name:'status', editable:true, hidden:true},
-		{header:'涓婚敭', name:'id', editable:true, hidden:true},
-		{header:'鎺掑簭鍙�', name:'testSort', width:150, editable:true, edittype:'text', editoptions:{'maxlength':'11', 'class':'form-control digits', 
-// 			'data-inputmask-alias':"money", 'data-inputmask': "'digits':'2'",
-			dataInit: function(element){
-// 				$(element).addClass('inputmask').attr('data-inputmask-alias', "money").attr('data-inputmask', "'digits':'2'").inputmask()
-				$(element).addClass('inputmask').attr({'data-inputmask-alias': "money", 'data-inputmask': "'digits':'2'"}).inputmask()
-// 				$(element).inputmask();
-			}
-		}},
-		{header:'鐖惰〃涓婚敭', name:'testData.id', editable:true, hidden:true},
-		{header:'鍗曡鏂囨湰', name:'testInput', width:150, editable:true, edittype:'text', editoptions:{'maxlength':'200', 'class':'form-control'}},
-		{header:'澶氳鏂囨湰', name:'testTextarea', width:150, editable:true, edittype:'textarea', editoptions:{'maxlength':'200', 'class':'form-control', 'rows':'1'}},
-		{header:'涓嬫媺妗�', name:'testSelect', width:100, 
-			editable:true, edittype:'select', editoptions:{'class':'form-control',
-				items: $.merge([{dictLabel:'&nbsp;',dictValue:''}], "#{@DictUtils.getDictListJson('sys_menu_type')}"),
-				itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){
-					js.select2(element).on("change",function(){$(this).resetValid()});
-				}
-			}
-		},
-		{header:'涓嬫媺澶氶��', name:'testSelectMultiple', width:100, 
-			editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control',
-				items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"),
-				itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){
-					js.select2(element).on("change",function(){$(this).resetValid()});
-				}
-			}
-		},
-		{header:'鍗曢�夋', name:'testRadio', width:100, 
-			editable:true, edittype:'select', editoptions:{'class':'form-control',
-				items: $.merge([{dictLabel:'&nbsp;',dictValue:''}], "#{@DictUtils.getDictListJson('sys_menu_type')}"),
-				itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){
-					js.select2(element).on("change",function(){$(this).resetValid()});
-				}
-			}
-		},
-		{header:'澶嶉�夋', name:'testCheckbox', width:100, 
-			editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control',
-				items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"),
-				itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){
-					js.select2(element).on("change",function(){$(this).resetValid()});
-				}
-			}
-		},
-		{header:'鏃ユ湡閫夋嫨', name:'testDate', width:150, 
-			formatter:'date', formatoptions:{srcformat:'Y-m-d H:i:s',newformat:'Y-m-d'},
-			editable:true, edittype:'text', editoptions:{'class':'form-control laydate ', 'readonly':'true',
-				dataInit: function(element){
-					laydate.render({elem:element, type:'date', format:'yyyy-MM-dd'});
-				}
-			}
-		},
-		{header:'鏃ユ湡鏃堕棿', name:'testDatetime', width:150, 
-			formatter:'date', formatoptions:{srcformat:'Y-m-d H:i:s',newformat:'Y-m-d H:i:s'},
-			editable:true, edittype:'text', editoptions:{'class':'form-control laydate ', 'readonly':'true',
-				dataInit: function(element){
-					laydate.render({elem:element, type:'datetime', format:'yyyy-MM-dd HH:mm'});
-				}
-			}
-		},
-		{header:'鐢ㄦ埛閫夋嫨', name:'testUser', width:150,
-			formatter: function(val, obj, row, act){
-				return js.val(row, 'testUser.userCode')+'|'+js.val(row, 'testUser.userName');
-			}, editable: true, edittype: "custom", editoptions: {
-				custom_element: function(val, editOptions) {
-					return js.template('treeselectTpl', {
-						id: 'user_'+editOptions.id, title: '鐢ㄦ埛閫夋嫨', 
-						name: 'testUser.userCode', value: val.split('|')[0], 
-						labelName: 'testUser.userName', labelValue: val.split('|')[1],
-						url: '${ctx}/sys/office/treeData?isLoadUser=true', cssClass: ''
-					});
-				}
-			}
-		},
-		{header:'${text("鐢ㄦ埛鍒楄〃閫夋嫨")}', name:'testUser2', width:150,
-			formatter: function(val, obj, row, act){
-				return js.val(row, 'testUser.userCode')+'|'+js.val(row, 'testUser.userName');
-			}, editable: true, edittype: "custom", editoptions: {
-				custom_element: function(val, editOptions) {
-					return js.template('listselectTpl', {
-						id: 'user_'+editOptions.id, title: '鐢ㄦ埛閫夋嫨', 
-						name: 'testUser.userCode', value: val.split('|')[0], 
-						labelName: 'testUser.userName', labelValue: val.split('|')[1],
-						url: '${ctx}/sys/empUser/empUserSelect', cssClass: '',
-						itemCode: 'userCode', itemName: 'userName'
-					});
-				}
-			}
-		},
-		{header:'鏈烘瀯閫夋嫨', name:'testOffice', width:150,
-			formatter: function(val, obj, row, act){
-				return js.val(row, 'testOffice.officeCode')+'|'+js.val(row, 'testOffice.officeName');
-			}, editable: true, edittype: "custom", editoptions: {
-				custom_element: function(val, editOptions) {
-					return js.template('treeselectTpl', {
-						id: 'office_'+editOptions.id, title: '鏈烘瀯閫夋嫨', 
-						name: 'testOffice.officeCode', value: val.split('|')[0], 
-						labelName: 'testOffice.officeName', labelValue: val.split('|')[1],
-						url: '${ctx}/sys/office/treeData?officeTypes=1,2', cssClass: ''
-					});
-				}
-			}
-		},
-		{header:'鍖哄煙閫夋嫨', name:'testAreaCode', width:150,
-			formatter: function(val, obj, row, act){
-				return js.val(row, 'testAreaCode')+'|'+js.val(row, 'testAreaName');
-			}, editable: true, edittype: "custom", editoptions: {
-				custom_element: function(val, editOptions) {
-					return js.template('treeselectTpl', {
-						id: 'area_'+editOptions.id, title: '鍖哄煙閫夋嫨', 
-						name: 'testAreaCode', value: val.split('|')[0], 
-						labelName: 'testAreaName', labelValue: val.split('|')[1],
-						url: '${ctx}/sys/area/treeData', cssClass: ''
-					});
-				}
-			}
-		},
-		{header:'鎿嶄綔', name:'actions', width:80, sortable:false, fixed:true, formatter: function(val, obj, row, act){
-			var actions = [];
-			if (val == 'new'){
-				actions.push('<a href="#" onclick="js.confirm(\'浣犵‘璁よ鍒犻櫎杩欐潯鏁版嵁鍚楋紵\', function(){$(\'#testDataChildDataGrid\').dataGrid(\'delRowData\',\''+obj.rowId+'\')});return false;"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			}else{
-				actions.push('<a href="#" onclick="js.confirm(\'浣犵‘璁よ鍒犻櫎杩欐潯鏁版嵁鍚楋紵\', function(){$(\'#testDataChildDataGrid\').dataGrid(\'setRowData\',\''+obj.rowId+'\',null,{display:\'none\'})});$(\'#'+obj.rowId+'_status\').val(\''+Global.STATUS_DELETE+'\');return false;"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			}
-			return actions.join('');
-		}, editoptions: {defaultValue: 'new'}}
-	],
-	
-	// 缂栬緫琛ㄦ牸鍙傛暟
-	editGrid: true,				// 鏄惁鏄紪杈戣〃鏍�
-	editGridInitRowNum: 3,		// 缂栬緫琛ㄦ牸鐨勫垵濮嬪寲鏂板琛屾暟
-	editGridAddRowBtn: $('#testDataChildDataGridAddRowBtn'),	// 瀛愯〃澧炶鎸夐挳
-	editGridAddRowInitData: {id: '', status: Global.STATUS_NORMAL},	// 鏂板琛岀殑鏃跺�欏垵濮嬪寲鐨勬暟鎹�
-	
-	// 缂栬緫琛ㄦ牸鐨勬彁浜ゆ暟鎹弬鏁�
-	editGridInputFormListName: 'testDataChildList', // 鎻愪氦鐨勬暟鎹垪琛ㄥ悕
-	editGridInputFormListAttrs: 'status,id,testSort,testData.id,testInput,testTextarea,testSelect,testSelectMultiple,testRadio,testCheckbox,testDate,testDatetime,testUser.userCode,testOffice.officeCode,testAreaCode,testAreaName,', // 鎻愪氦鏁版嵁鍒楄〃鐨勫睘鎬у瓧娈�
-	
-	//# // 鍔犺浇鎴愬姛鍚庢墽琛屼簨浠�
-	ajaxSuccess: function(data){
-		
-	}
-});
-</script>
-<script id="treeselectTpl" type="text/template">//<!--<div>
-<#form:treeselect id="{{d.id}}" title="{{d.title}}" name="{{d.name}}" value="{{d.value}}"
-	labelName="{{d.labelName}}" labelValue="{{d.labelValue}}" url="{{d.url}}"
-	class="{{d.cssClass}}" btnClass="btn-sm" allowClear="true"/>
-</div>//--></script>
-<script id="listselectTpl" type="text/template">//<!--<div>
-<#form:listselect id="{{d.id}}" title="{{d.title}}" name="{{d.name}}" value="{{d.value}}"
-	labelName="{{d.labelName}}" labelValue="{{d.labelValue}}" url="{{d.url}}"
-	class="{{d.cssClass}}" btnClass="btn-sm" allowClear="true"
-	itemCode="{{d.itemCode}}" itemName="{{d.itemName}}"/>
-</div>//--></script>
-<script>
-$('#inputForm').validate({
-	submitHandler: function(form){
-		
-		// 鏁版嵁鏍煎紡鍖栨仮澶嶏紙琛ㄥ崟鎻愪氦涔嬪墠璋冪敤锛�
-		$('.inputmask').inputmask('remove');
-		
-// 		js.ajaxSubmitForm($(form), function(data){
-// 			js.showMessage(data.message);
-// 			if(data.result == Global.TRUE){
-// 				js.closeCurrentTabPage(function(contentWindow){
-// 					contentWindow.page();
-// 				});
-// 			}
-// 		}, "json");
-		log($(form).serializeArray());
-		js.showMessage('妯℃嫙淇濆瓨鎴愬姛');
-		
-		// 鏁版嵁鏍煎紡鍖栵紙鍒濆鍖栧畬鎴愯〃鍗曞悗璋冪敤锛�
-		$(".inputmask").inputmask();
-    }
-});
-
-//鏁版嵁鏍煎紡鍖栵紙鍒濆鍖栧畬鎴愯〃鍗曞悗璋冪敤锛�
-$(".inputmask").inputmask();
-
-</script>
\ No newline at end of file
diff --git a/web/src/main/resources/views/modules/demo/demoFormLaydate.html b/web/src/main/resources/views/modules/demo/demoFormLaydate.html
deleted file mode 100644
index 03c86e5c..00000000
--- a/web/src/main/resources/views/modules/demo/demoFormLaydate.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<% layout('/layouts/default.html', {title: '鏂囦功鍐呭', libs: ['validate','dataGrid','fileupload']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<button type="button" class="btn btn-sm btn-primary" onclick="openEdit(1)" id="submitBtn"><i class="fa fa-arrow-right"></i> ${text('鏃堕棿寮圭獥')}</button>
-	</div>
-</div>
-<% } %>
-<script>
-function openEdit(docId){
-	js.layer.open({
-		type: 1,
-		area: ['400px'],
-		title: '${text("瀹℃牳瀹℃壒鏃堕棿淇敼")}',
-		resize: false,
-		scrollbar: true,
-		content: js.template('importTpl'),
-		success: function(layero, index){
-			layero.find('.laydate').on('click', function(e){
-				var id = $(this).attr('id');
-				top.laydate.render({
-				    elem: '#'+id, show: true, closeStop: '#'+id
-				});
-			});
-		},
-		btn: ['<i class="fa fa-check"></i> ${text("纭")}',
-			'<i class="fa fa-remove"></i> ${text("鍏抽棴")}'],
-		btn1: function(index, layero){
-			var form = {
-				inputForm: layero.find('#inputDateForm'),
-				shDate: layero.find('#shDate').val(),
-				spDate: layero.find('#spDate').val()
-			};
-			if (docId == '' || form.shDate == '' ||form.spDate == ''){
-				js.showMessage("${text('璇风‘璁ら渶瑕佷慨鏀圭殑鍐呭')}", null, 'warning');
-				return false;
-			}
-			return true;
-		}
-	});
-}
-</script>
-<script id="importTpl" type="text/template">//<!--
-<form id="inputDateForm" action="${ctx}/doc/base/docBase/updateDate" method="post" enctype="multipart/form-data"
-		class="form-horizontal mt20 mb10" style="overflow:auto;max-height:200px;">
-	<div class="row">
-		<div class="form-group">
-			<label class="control-label col-sm-4" title="">
-				<span class="required">*</span> ${text('瀹℃牳鏃堕棿')}锛�<i class="fa icon-question hide"></i>
-			</label>
-			<div class="col-sm-8">
-				<#form:input name="shDate" dataFormat="yyyy-MM-dd" readonly="true" maxlength="20" class="form-control laydate width-250"
-                    data-type="date" lay-key="1"/>
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="control-label col-sm-4" title="">
-				<span class="required">*</span> ${text('瀹℃壒鏃堕棿')}锛�<i class="fa icon-question hide"></i>
-			</label>
-			<div class="col-sm-8">
-                <#form:input name="spDate" dataFormat="yyyy-MM-dd" readonly="true" maxlength="20" class="form-control laydate width-250"
-                    data-type="date" lay-key="2"/>
-			</div>
-		</div>
-	</div>
-</form>
-//--></script>
\ No newline at end of file
diff --git a/web/src/main/resources/views/modules/demo/demoFormTabPage.html b/web/src/main/resources/views/modules/demo/demoFormTabPage.html
deleted file mode 100644
index 34d48df6..00000000
--- a/web/src/main/resources/views/modules/demo/demoFormTabPage.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<% layout('/layouts/default.html', {title: '澶氶〉绛惧簲鐢ㄧず渚�', libs: ['tabPage']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header with-border">
-			<div class="box-title">
-				<i class="fa icon-notebook"></i> 澶氶〉绛惧簲鐢ㄧず渚�
-			</div>
-			<div class="box-tools pull-right">
-				<button type="button" class="btn btn-box-tool" onclick="js.addTabPage(null, '鏈烘瀯鍒楄〃', '${ctx}/sys/office/list'+p)"><i class="fa fa-plus"></i> 娣诲姞椤电(1)</button>
-				<button type="button" class="btn btn-box-tool" onclick="b.addTabPage(null, '鍏徃鍒楄〃', '${ctx}/sys/company/list'+p)"><i class="fa fa-plus"></i> 娣诲姞椤电(2)</button>
-				<button type="button" class="btn btn-box-tool" onclick="top.js.closeCurrentTabPage()"><i class="fa fa-close"></i> 鍏抽棴绐楀彛</button>
-			</div>
-		</div>
-		<div class="box-body pt0">
-			<div class="row">
-				<div class="col-sm-6 pr0">
-					<div id="tabpanel1"></div>
-				</div>
-				<div class="col-sm-6 pl0">
-					<div id="tabpanel2"></div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-<% } %>
-
-<style>
-	.tabpanel {padding-top:4px;}
-	.tabpanel_tab_content {border:0;}
-	.tabpanel_tab_content .tabpanel_move_content {background: #fff;}
-	.tabpanel_content .html_content {background:#fff;padding:0;}
-</style>
-
-<script>
-	// 涓�涓〉闈竴涓� tab 鎺т欢
-	js.initTabPage('tabpanel1', {
-		height: function () {
-			var windowHeight = $(window).height(),
-				headerHeight = $('.box-header').outerHeight() || 0,
-				footerHeight = $('.box-footer').outerHeight() || 0,
-				height = windowHeight - headerHeight - footerHeight - 20;
-			return height < 300 ? 300 : height;
-		}
-	});
-	// 鎵撳紑绀轰緥椤甸潰锛堜笉鍙叧闂級
-	var p = '?__layer=true'; // 闅愯棌鏍囬
-	js.addTabPage(null, "鏈烘瀯鍒楄〃", "${ctx}/sys/office/list"+p, false);
-	js.addTabPage(null, "鐢ㄦ埛鍒楄〃", "${ctx}/sys/empUser/list"+p, false);
-	// 鐢ㄤ簬鏈烘瀯淇濆瓨鍚庣殑鍒锋柊鍒楄〃椤甸潰锛堢ず渚嬶級
-	window.win = $('#tabpanel1 iframe:first')[0].contentWindow;
-	// 婵�娲荤涓�涓〉绛�
-	$('#tabpanel1 .tabpanel_mover li:first').click();
-	
-	// 涓�涓〉闈㈠涓� tab 鎺т欢灞曠ず
-	var b = $.extend([], tabPage);
-	b.initTabPage('tabpanel2', {
-		height: function () {
-			var windowHeight = $(window).height(),
-				headerHeight = $('.box-header').outerHeight() || 0,
-				footerHeight = $('.box-footer').outerHeight() || 0,
-				height = windowHeight - headerHeight - footerHeight - 20;
-			return height < 300 ? 300 : height;
-		}
-	});
-	b.addTabPage(null, "宀椾綅鍒楄〃", "${ctx}/sys/post/list"+p, false);
-	b.addTabPage(null, "鍏徃鍒楄〃", "${ctx}/sys/company/list"+p, false);
-	$('#tabpanel2 .tabpanel_mover li:first').click();
-	
-	// 鎸囧畾鍐呴〉璋冪敤鐨� tab 瀵硅薄
-	window.tabPage = top.tabPage;
-</script>
\ No newline at end of file
diff --git a/web/src/main/resources/views/modules/demo/demoFormTableForm.html b/web/src/main/resources/views/modules/demo/demoFormTableForm.html
deleted file mode 100644
index 87ac93c0..00000000
--- a/web/src/main/resources/views/modules/demo/demoFormTableForm.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<% layout('/layouts/default.html', {title: '鏁版嵁绠＄悊', libs: ['validate','fileupload','ueditor','dataGrid']}){ %>
-<div class="main-content print-form">
-	<div class="box box-main">
-		<div class="box-header with-border">
-			<div class="box-title">
-				<i class="fa icon-notebook"></i> 琛ㄦ牸琛ㄥ崟瀹炰緥
-			</div>
-			<div class="box-tools pull-right hide">
-				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-			</div>
-		</div>
-		<#form:form id="inputForm" model="${testData}" action="${ctx}/test/testData/save" method="post" class="form-horizontal">
-			<div class="table-fdiv width-960">
- 				<h3>浜у搧淇℃伅鎯呭喌</h3>
-				<table class="table-form">
-					<tr class="form-title"><td colspan="6">鍩烘湰淇℃伅</td></tr>
-					<tr>
-						<td class="form-label" width="150"><span class="required">*</span> 璐熻矗浜�</td>
-						<td>
-							<#form:input path="testInput" maxlength="200" class="form-control required" defaultValue="灏忕帇"/>
-						</td>
-						<td class="form-label" width="150">鎵�灞為儴闂�</td>
-						<td>
-							<#form:treeselect id="testOffice" title="鏈烘瀯閫夋嫨"
-									path="testOffice.officeCode" labelPath="testOffice.officeName"
-									url="${ctx}/sys/office/treeData" defaultLabel="鎶�鏈儴"
-									class="required" allowClear="true"/>
-						</td>
-						<td rowspan="3" width="110">
-							<div style="width:110px;height:110px;overflow:hidden;">
-								<#form:fileupload id="uploadImage" bizKey="${testData.id}" bizType="testData_image"
-									uploadType="image" class="" readonly="false" preview="true"
-									maxUploadNum="1" isMini="true"/>
-							</div>
-						</td>
-					</tr>
-					<tr>
-						<td class="form-label">鍗曡鏂囨湰</td>
-						<td>
-							<#form:input path="testInput" maxlength="200" class="form-control" defaultValue="婕旂ず鏂囨湰"/>
-						</td>
-						<td class="form-label">鍗曡鏂囨湰</td>
-						<td>
-							<#form:input path="testInput" maxlength="200" class="form-control" defaultValue="婕旂ず鏂囨湰"/>
-						</td>
-					</tr>
-					<tr>
-						<td class="form-label">涓嬫媺妗�</td>
-						<td>
-							<#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control" defaultValue="1"/>
-						</td>
-						<td class="form-label">涓嬫媺澶氶��</td>
-						<td>
-							<#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control" defaultValue="2"/>
-						</td>
-					</tr>
-					<tr>
-						<td class="form-label">鍗曢�夋</td>
-						<td>
-							<#form:radio path="testRadio" dictType="sys_menu_type" class="form-control" defaultValue="1"/>
-						</td>
-						<td class="form-label">澶嶉�夋</td>
-						<td colspan="2">
-							<#form:checkbox path="testCheckbox" dictType="sys_menu_type" class="form-control" defaultValue="1"/>
-						</td>
-					</tr>
-					<tr>
-						<td class="form-label">鏃ユ湡閫夋嫨</td>
-						<td>
-							<#form:input path="testDate" readonly="true" maxlength="20" class="form-control laydate "
-									dataFormat="date" data-type="date" data-format="yyyy-MM-dd" defaultValue="${date()}"/>
-						</td>
-						<td class="form-label">鏃ユ湡鏃堕棿</td>
-						<td colspan="2">
-							<#form:input path="testDatetime" readonly="true" maxlength="20" class="form-control laydate "
-									dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" defaultValue="${date()}"/>
-						</td>
-					</tr>
-					<tr>
-						<td class="form-label">鍥㈤槦浜烘暟</td>
-						<td colspan="4">鍏� <input class="text-center width-60" value="100"/> 浜恒�傚叾涓妧鏈汉鍛�
-							 <input class="text-center width-60 digits" value="60"/> 浜恒��
-						</td>
-					</tr>
-					<tr>
-						<td class="form-label">鍔炲叕闈㈢Н</td>
-						<td><input class="width-60 text-center number" value="200"/> M虏</td>
-						<td class="form-label">鏈嶅姟鎴锋暟</td>
-						<td colspan="2"><input class="width-60 text-center digits" value="9999"/> 瀹�</td>
-					</tr>
-					<tr class="form-title"><td colspan="6">璇︾粏淇℃伅</td></tr>
-					<tr>
-						<td colspan="6">
-							<table class="table-form">
-								<tr>
-									<td class="form-label">椤圭洰缂栧彿</td>
-									<td><input class="form-control" value="1234567890123"/></td>
-									<td class="form-label">椤圭洰鍚嶇О</td>
-									<td><input class="form-control" value="JeeSite"/></td>
-									<td class="form-label">椤圭洰鐗堟湰</td>
-									<td><input class="form-control" value="V4.3.0"/></td>
-								</tr>
-								<tr>
-									<td class="form-label">鏂板浜у��</td>
-									<td><input class="width-60 text-right" value="0.00"/> 涓囧厓</td>
-									<td class="form-label">鏂板閿�鍞</td>
-									<td><input class="width-60 text-right" value="0.00"/> 涓囧厓</td>
-									<td class="form-label">鏂板浜ょ◣鎬婚</td>
-									<td><input class="width-60 text-right" value="0.00"/> 涓囧厓</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td class="form-label">鍐呭绠�浠�</td>
-						<td colspan="4">
-							<textarea name="remarks" rows="5" class="form-control autoHeight">杩欐槸涓�涓枃鏈紝鏀寔鑷姩楂樺害锛屽湪杩欓噷鎸夊洖杞︾湅鏁堟灉</textarea>
-						</td>
-					</tr>
-					<tr>
-						<td class="form-label" nowrap="nowrap">瀛愯〃鏁版嵁</td>
-						<td colspan="4">
-							<table id="testDataChildDataGrid"></table>
-							<a href="#" id="testDataChildDataGridAddRowBtn" class="btn btn-primary btn-sm mt10 mb10"><i class="fa fa-plus"></i> 澧炶</a>
-						</td>
-					</tr>
-				</table>
-				<table class="table-form mt10">
-					<tr class="form-title"><td colspan="4">闄勪欢</td></tr>
-					<tr>
-						<td colspan="4">
-							<#form:fileupload id="uploadFile" bizKey="${testData.id}" bizType="testData_file"
-									uploadType="all" class="" readonly="false" preview="true"/>
-						</td>
-					</tr>
-				</table>
-				<div class="form-actions">
-					<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> 淇� 瀛�</button>&nbsp;
-					<button type="button" class="btn btn-sm btn-info" id="btnPrint" onclick="window.print()"><i class="fa fa-print"></i> 鎵� 鍗�</button>&nbsp;
-					<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> 鍏� 闂�</button>
-				</div>
-			</div>
-		
-		</#form:form>
-	</div>
-</div>
-<% } %>
-<script>
-//鍒濆鍖栨祴璇曟暟鎹瓙琛―ataGrid瀵硅薄
-$("#testDataChildDataGrid").dataGrid({
-
-	data: "#{toJson(testData.testDataChildList)}",
-	datatype: "local", // 璁剧疆鏈湴鏁版嵁
-	autoGridHeight: function(){return 'auto'}, // 璁剧疆鑷姩楂樺害
-	
-	// 璁剧疆鏁版嵁琛ㄦ牸鍒�
-	columnModel: [
-		{header:'鐘舵��', name:'status', editable:true, hidden:true},
-		{header:'涓婚敭', name:'id', editable:true, hidden:true},
-		{header:'鍗曡鏂囨湰', name:'testInput', width:100, editable:true, edittype:'text', editoptions:{'maxlength':'200', 'class':'form-control'}},
-		{header:'澶氳鏂囨湰', name:'testTextarea', width:100, editable:true, edittype:'textarea', editoptions:{'maxlength':'200', 'class':'form-control', 'rows':'1'}},
-		{header:'涓嬫媺妗�', name:'testSelect', width:100, 
-			editable:true, edittype:'select', editoptions:{'class':'form-control',
-				items: $.merge([{dictLabel:'&nbsp;',dictValue:''}], "#{@DictUtils.getDictListJson('sys_menu_type')}"),
-				itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){
-					js.select2(element).on("change",function(){$(this).resetValid()});
-				}
-			}
-		},
-		{header:'鏃ユ湡閫夋嫨', name:'testDate', width:100, 
-			formatter:'date', formatoptions:{srcformat:'Y-m-d H:i:s',newformat:'Y-m-d'},
-			editable:true, edittype:'text', editoptions:{'class':'form-control laydate ', 'readonly':'true',
-				dataInit: function(element){
-					laydate.render({elem:element, type:'date', format:'yyyy-MM-dd'});
-				}
-			}
-		},
-		{header:'鐢ㄦ埛閫夋嫨', name:'testUser', width:100,
-			formatter: function(val, obj, row, act){
-				return js.val(row, 'testUser.userCode')+'|'+js.val(row, 'testUser.userName');
-			}, editable: true, edittype: "custom", editoptions: {
-				custom_element: function(val, editOptions) {
-					return js.template('treeselectTpl', {
-						id: 'user_'+editOptions.id, title: '鐢ㄦ埛閫夋嫨', 
-						name: 'testUser.userCode', value: val.split('|')[0], 
-						labelName: 'testUser.userName', labelValue: val.split('|')[1],
-						url: '${ctx}/sys/office/treeData?isLoadUser=true', cssClass: ''
-					});
-				}
-			}
-		},
-		{header:'鎿嶄綔', name:'actions', width:80, sortable:false, fixed:true, formatter: function(val, obj, row, act){
-			var actions = [];
-			if (val == 'new'){
-				actions.push('<a href="#" onclick="js.confirm(\'浣犵‘璁よ鍒犻櫎杩欐潯鏁版嵁鍚楋紵\', function(){$(\'#testDataChildDataGrid\').dataGrid(\'delRowData\',\''+obj.rowId+'\')});return false;"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			}else{
-				actions.push('<a href="#" onclick="js.confirm(\'浣犵‘璁よ鍒犻櫎杩欐潯鏁版嵁鍚楋紵\', function(){$(\'#testDataChildDataGrid\').dataGrid(\'setRowData\',\''+obj.rowId+'\',null,{display:\'none\'})});$(\'#'+obj.rowId+'_status\').val(\''+Global.STATUS_DELETE+'\');return false;"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			}
-			return actions.join('');
-		}, editoptions: {defaultValue: 'new'}}
-	],
-	
-	// 缂栬緫琛ㄦ牸鍙傛暟
-	editGrid: true,				// 鏄惁鏄紪杈戣〃鏍�
-	editGridInitRowNum: 1,		// 缂栬緫琛ㄦ牸鐨勫垵濮嬪寲鏂板琛屾暟
-	editGridAddRowBtn: $('#testDataChildDataGridAddRowBtn'),	// 瀛愯〃澧炶鎸夐挳
-	editGridAddRowBtnToHeader: true,	// 瀛愯〃澧炶鎸夐挳鏄惁鏄剧ず鍒拌〃澶翠笂 v4.1.7
-	editGridAddRowInitData: {id: '', status: Global.STATUS_NORMAL},	// 鏂板琛岀殑鏃跺�欏垵濮嬪寲鐨勬暟鎹�
-	
-	// 缂栬緫琛ㄦ牸鐨勬彁浜ゆ暟鎹弬鏁�
-	editGridInputFormListName: 'testDataChildList', // 鎻愪氦鐨勬暟鎹垪琛ㄥ悕
-	editGridInputFormListAttrs: 'status,id,testSort,testData.id,testInput,testTextarea,testSelect,testSelectMultiple,testRadio,testCheckbox,testDate,testDatetime,testUser.userCode,testOffice.officeCode,testAreaCode,testAreaName,', // 鎻愪氦鏁版嵁鍒楄〃鐨勫睘鎬у瓧娈�
-	
-	//# // 鍔犺浇鎴愬姛鍚庢墽琛屼簨浠�
-	ajaxSuccess: function(data){
-		
-	}
-});
-</script>
-<script id="treeselectTpl" type="text/template">//<!--<div>
-<#form:treeselect id="{{d.id}}" title="{{d.title}}" name="{{d.name}}" value="{{d.value}}"
-	labelName="{{d.labelName}}" labelValue="{{d.labelValue}}" url="{{d.url}}"
-	class="{{d.cssClass}}" btnClass="btn-sm" allowClear="true"/>
-</div>//--></script>
-<script>
-$("#inputForm").validate({
-	submitHandler: function(form){
-// 		js.ajaxSubmitForm($(form), function(data){
-// 			js.showMessage(data.message);
-// 			if(data.result == Global.TRUE){
-// 				js.closeCurrentTabPage(function(contentWindow){
-// 					contentWindow.page();
-// 				});
-// 			}
-// 		}, "json");
-		js.showMessage('妯℃嫙淇濆瓨鎴愬姛');
-    }
-});
-</script>
\ No newline at end of file
diff --git a/web/src/main/resources/views/modules/test/testDataForm.html b/web/src/main/resources/views/modules/test/testDataForm.html
deleted file mode 100644
index 9da06181..00000000
--- a/web/src/main/resources/views/modules/test/testDataForm.html
+++ /dev/null
@@ -1,403 +0,0 @@
-<% layout('/layouts/default.html', {title: '鏁版嵁绠＄悊', libs: ['validate','fileupload','dataGrid']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header with-border">
-			<div class="box-title">
-				<i class="fa icon-note"></i> ${text(testData.isNewRecord ? '鏂板鏁版嵁' : '缂栬緫鏁版嵁')}
-			</div>
-			<div class="box-tools pull-right hide">
-				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-			</div>
-		</div>
-		<#form:form id="inputForm" model="${testData}" action="${ctx}/test/testData/save" method="post" class="form-horizontal">
-			<div class="box-body">
-				<div class="form-unit">${text('鍩烘湰淇℃伅')}</div>
-				<#form:hidden path="id"/>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2" title="">
-								<span class="required hide">*</span> ${text('鍗曡鏂囨湰')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-10">
-								<#form:input path="testInput" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2" title="">
-								<span class="required hide">*</span> ${text('澶氳鏂囨湰')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-10">
-								<#form:textarea path="testTextarea" rows="4" maxlength="200" class="form-control"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> ${text('涓嬫媺妗�')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control" />
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> ${text('涓嬫媺澶氶��')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control" />
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> ${text('鍗曢�夋')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:radio path="testRadio" dictType="sys_menu_type" class="form-control" />
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> ${text('澶嶉�夋')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:checkbox path="testCheckbox" dictType="sys_menu_type" class="form-control" />
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> ${text('鏃ユ湡閫夋嫨')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="testDate" readonly="true" maxlength="20" class="form-control laydate"
-									dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> ${text('鏃ユ湡鏃堕棿')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="testDatetime" readonly="true" maxlength="20" class="form-control laydate"
-									dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> ${text('鐢ㄦ埛閫夋嫨')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:treeselect id="testUser" title="${text('鐢ㄦ埛閫夋嫨')}"
-									path="testUser.userCode" labelPath="testUser.userName"
-									url="${ctx}/sys/office/treeData?isLoadUser=true"
-									class="" allowClear="true"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> ${text('鏈烘瀯閫夋嫨')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:treeselect id="testOffice" title="${text('鏈烘瀯閫夋嫨')}"
-									path="testOffice.officeCode" labelPath="testOffice.officeName"
-									url="${ctx}/sys/office/treeData"
-									class="" allowClear="true"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> ${text('鍖哄煙閫夋嫨')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:treeselect id="testAreaCode" title="${text('鍖哄煙閫夋嫨')}"
-									path="testAreaCode" labelPath="testAreaName"
-									url="${ctx}/sys/area/treeData"
-									class="" allowClear="true"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2" title="">
-								<span class="required hide">*</span> ${text('澶囨敞淇℃伅')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-10">
-								<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2">${text('鍥剧墖涓婁紶')}锛�</label>
-							<div class="col-sm-10">
-								<#form:fileupload id="uploadImage" bizKey="${testData.id}" bizType="testData_image"
-									uploadType="image" class="" readonly="false" preview="true"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2">${text('闄勪欢涓婁紶')}锛�</label>
-							<div class="col-sm-10">
-								<#form:fileupload id="uploadFile" bizKey="${testData.id}" bizType="testData_file"
-									uploadType="all" class="" readonly="false" preview="true"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="form-unit">${text('瀛愯〃鏁版嵁')}</div>
-				<div class="form-unit-wrap table-form">
-					<table id="testDataChildDataGrid"></table>
-					<% if (hasPermi('test:testData:edit')){ %>
-						<a href="#" id="testDataChildDataGridAddRowBtn" class="btn btn-primary btn-sm mt10 mb10"><i class="fa fa-plus"></i> ${text('澧炶')}</a>
-					<% } %>
-				</div>
-			</div>
-			<div class="box-footer">
-				<div class="row">
-					<div class="col-sm-offset-2 col-sm-10">
-						<% if (hasPermi('test:testData:edit')){ %>
-							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> ${text('淇� 瀛�')}</button>&nbsp;
-						<% } %>
-						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> ${text('鍏� 闂�')}</button>
-					</div>
-				</div>
-			</div>
-		</#form:form>
-	</div>
-</div>
-<% } %>
-<script>
-//鍒濆鍖栨祴璇曟暟鎹瓙琛―ataGrid瀵硅薄
-$('#testDataChildDataGrid').dataGrid({
-
-	data: "#{toJson(testData.testDataChildList)}",
-	datatype: 'local', // 璁剧疆鏈湴鏁版嵁
-	autoGridHeight: function(){return 'auto'}, // 璁剧疆鑷姩楂樺害
-	
-	// 璁剧疆鏁版嵁琛ㄦ牸鍒�
-	columnModel: [
-
-		{header:'${text("鎿嶄綔")}', name:'actions', width:40, align:"center", formatter: function(val, obj, row, act){
-			var actions = [];
-			if (val == 'new'){
-				actions.push('<a href="#" onclick="js.confirm(\'${text("浣犵‘璁よ鍒犻櫎杩欐潯鏁版嵁鍚楋紵")}\', function(){$(\'#testDataChildDataGrid\').dataGrid(\'delRowData\',\''+obj.rowId+'\')});return false;"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			}else{
-				actions.push('<a href="#" onclick="js.confirm(\'${text("浣犵‘璁よ鍒犻櫎杩欐潯鏁版嵁鍚楋紵")}\', function(){$(\'#testDataChildDataGrid\').dataGrid(\'setRowData\',\''+obj.rowId+'\',null,{display:\'none\'});$(\'#'+obj.rowId+'_status\').val(\''+Global.STATUS_DELETE+'\');});return false;"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			}
-			return actions.join('');
-		}, editoptions: {defaultValue: 'new'}},
-
-		{header:'鐘舵��', name:'status', editable:true, hidden:true},
-		{header:'涓婚敭', name:'id', editable:true, hidden:true},
-		{header:'${text("鎺掑簭鍙�")}', name:'testSort', width:100, editable:true, edittype:'text', editoptions:{'maxlength':'11', 'class':'form-control digits'}},
-		{header:'${text("鐖惰〃涓婚敭")}', name:'testData.id', editable:true, hidden:true},
-		{header:'${text("鍗曡鏂囨湰")}', name:'testInput', width:100, editable:true, edittype:'text', editoptions:{'maxlength':'200', 'class':'form-control'}},
-		{header:'${text("澶氳鏂囨湰")}', name:'testTextarea', width:100, editable:true, edittype:'textarea', editoptions:{'maxlength':'200', 'class':'form-control', 'rows':'1'}},
-		{header:'${text("涓嬫媺妗�")}', name:'testSelect', width:100, 
-			editable:true, edittype:'select', editoptions:{'class':'form-control',
-				items: $.merge([{dictLabel:'&nbsp;',dictValue:''}], "#{@DictUtils.getDictListJson('sys_menu_type')}"),
-				itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){
-					js.select2(element).on("change",function(){$(this).resetValid()});
-				}
-			}
-		},
-		{header:'${text("涓嬫媺澶氶��")}', name:'testSelectMultiple', width:90, fixed: true, 
-			editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control',
-				items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"),
-				itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){
-					js.select2(element).on("change",function(){$(this).resetValid()});
-				}
-			}
-		},
-		{header:'${text("鍗曢�夋")}', name:'testRadio', width:135, fixed: true,
-			editable:true, edittype:'radio', editoptions:{'class':'form-control icheck',
-				items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"),
-				itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){
-					js.iCheck(element).on("ifChanged",function(){$(this).resetValid()});
-				}
-			}
-		},
-		{header:'${text("澶嶉�夋")}', name:'testCheckbox', width:135, fixed: true, 
-			editable:true, edittype:'checkbox', editoptions:{'class':'form-control icheck',
-				items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"),
-				itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){
-					js.iCheck(element).on("ifChanged",function(){$(this).resetValid()});
-				}
-			}
-		},
-		{header:'${text("鏃ユ湡閫夋嫨")}', name:'testDate', width:120, 
-			formatter:'date', formatoptions:{srcformat:'Y-m-d H:i:s',newformat:'Y-m-d'},
-			editable:true, edittype:'text', editoptions:{'class':'form-control laydate', 'readonly':'true',
-				dataInit: function(element){
-					laydate.render({elem:element, type:'date', format:'yyyy-MM-dd', done: function(){
-						// 閫夋嫨鏃ユ湡鍚庯紝鑷姩缁欎笅涓�涓緭鍏ユ璧嬪�硷紙鑱斿姩瀹炰緥锛�
-						// $(element).closest('td').next().find('.form-control').val('2020-11-26 10:10');
-					}});
-				}
-			}
-		},
-		{header:'${text("鏃ユ湡鏃堕棿")}', name:'testDatetime', width:155, 
-			formatter:'date', formatoptions:{srcformat:'Y-m-d H:i:s',newformat:'Y-m-d H:i'},
-			editable:true, edittype:'text', editoptions:{'class':'form-control laydate', 'readonly':'true',
-				dataInit: function(element){
-					laydate.render({elem:element, type:'datetime', format:'yyyy-MM-dd HH:mm'});
-				}
-			}
-		},
-		{header:'${text("鐢ㄦ埛閫夋嫨")}', name:'testUser', width:100,
-			formatter: function(val, obj, row, act){
-				return js.val(row, 'testUser.userCode')+'|'+js.val(row, 'testUser.userName');
-			}, editable: true, edittype: "custom", editoptions: {
-				custom_element: function(val, editOptions) {
-					return js.template('treeselectTpl', {
-						id: 'user_'+editOptions.id, title: '鐢ㄦ埛閫夋嫨', 
-						name: 'testUser.userCode', value: val.split('|')[0], 
-						labelName: 'testUser.userName', labelValue: val.split('|')[1],
-						url: '${ctx}/sys/office/treeData?isLoadUser=true', cssClass: '', readonly: false
-					});
-				},
-				custom_value: function(element, act){
-					return {userCode: element.find('[type=hidden]').val(),
-						userName: element.find('[type=text]').val()};
-				},
-				dataInit: function(element){
-					// 鍒濆鍖栨帶浠跺悗璁剧疆鍙妯″紡锛堝疄渚嬶級
-					// $(element).find('.form-control, .btn').addClass('disabled');
-				}
-			}, 
-			unformat: function(val, obj, cell){
-				return $('#user_'+obj.rowId+'_'+obj.colModel.name+'Code', cell).val();
-			}
-		},
-		{header:'${text("鐢ㄦ埛閫夋嫨")}', name:'testUser2', width:100,
-			formatter: function(val, obj, row, act){
-				return js.val(row, 'testUser.userCode')+'|'+js.val(row, 'testUser.userName');
-			}, editable: true, edittype: "custom", editoptions: {
-				custom_element: function(val, editOptions) {
-					return js.template('listselectTpl', {
-						id: 'user_'+editOptions.id, title: '鐢ㄦ埛閫夋嫨', 
-						name: 'testUser2.userCode', value: val.split('|')[0], 
-						labelName: 'testUser2.userName', labelValue: val.split('|')[1],
-						url: '${ctx}/sys/empUser/empUserSelect', cssClass: '', readonly: false,
-						itemCode: 'userCode', itemName: 'userName'
-					});
-				}
-			}
-		},
-		{header:'${text("鏈烘瀯閫夋嫨")}', name:'testOffice', width:100, title:false,
-			formatter: function(val, obj, row, act){
-				return js.val(row, 'testOffice.officeCode')+'|'+js.val(row, 'testOffice.officeName');
-			}, editable: true, edittype: "custom", editoptions: {
-				custom_element: function(val, editOptions) {
-					return js.template('treeselectTpl', {
-						id: 'office_'+editOptions.id, title: '鏈烘瀯閫夋嫨', 
-						name: 'testOffice.officeCode', value: val.split('|')[0], 
-						labelName: 'testOffice.officeName', labelValue: val.split('|')[1],
-						url: '${ctx}/sys/office/treeData?officeTypes=1,2', cssClass: '', readonly: false
-					});
-				}
-			}
-		},
-		{header:'${text("鍖哄煙閫夋嫨")}', name:'testAreaCode', width:100,
-			formatter: function(val, obj, row, act){
-				return js.val(row, 'testAreaCode')+'|'+js.val(row, 'testAreaName');
-			}, editable: true, edittype: "custom", editoptions: {
-				custom_element: function(val, editOptions) {
-					return js.template('treeselectTpl', {
-						id: 'area_'+editOptions.id, title: '鍖哄煙閫夋嫨', 
-						name: 'testAreaCode', value: val.split('|')[0], 
-						labelName: 'testAreaName', labelValue: val.split('|')[1],
-						url: '${ctx}/sys/area/treeData', cssClass: '', readonly: false
-					});
-				}
-			}
-		},
-		{header:'${text("鏂囦欢涓婁紶")}', name:'id', width:200,
-			editable: true, edittype: "custom", editoptions: {
-				custom_element: function(val, editOptions) {
-					return js.template('fileuploadTpl', {
-						id: 'fileupload_'+editOptions.id, title: '鍖哄煙閫夋嫨', 
-						bizKey: val, bizType: 'testDataChild_file', cssClass: '', readonly: false
-					});
-				}
-			}
-		}
-	],
-	shrinkToFit: false,	// 鏄惁鎸夌櫨鍒嗘瘮鑷姩璋冩暣鍒楀
-	
-	// 缂栬緫琛ㄦ牸鍙傛暟
-	editGrid: true,				// 鏄惁鏄紪杈戣〃鏍�
-	editGridInitRowNum: 1,		// 缂栬緫琛ㄦ牸鐨勫垵濮嬪寲鏂板琛屾暟
-	editGridAddRowBtn: $('#testDataChildDataGridAddRowBtn'),	// 瀛愯〃澧炶鎸夐挳
-	editGridAddRowBtnToHeader: true,	// 瀛愯〃澧炶鎸夐挳鏄惁鏄剧ず鍒拌〃澶翠笂 v4.1.7
-	editGridAddRowInitData: {id: '', status: Global.STATUS_NORMAL},	// 鏂板琛岀殑鏃跺�欏垵濮嬪寲鐨勬暟鎹�
-	
-	// 缂栬緫琛ㄦ牸鐨勬彁浜ゆ暟鎹弬鏁�
-	editGridInputFormListName: 'testDataChildList', // 鎻愪氦鐨勬暟鎹垪琛ㄥ悕
-	editGridInputFormListAttrs: 'status,id,testSort,testData.id,testInput,testTextarea,testSelect,testSelectMultiple,'
-		+'testRadio,testCheckbox,testDate,testDatetime,testUser.userCode,testOffice.officeCode,'
-		+'testAreaCode,testAreaName,testDataChild_file,testDataChild_file__del', // 鎻愪氦鏁版嵁鍒楄〃鐨勫睘鎬у瓧娈�
-	
-	//# // 鍔犺浇鎴愬姛鍚庢墽琛屼簨浠�
-	ajaxSuccess: function(data){
-// 		$('#jqgh_testDataChildDataGrid_rn').append('<a href="javascript:" onclick="'
-// 				+ '$(\'#testDataChildDataGridAddRowBtn\').click();">'
-// 				+ '<i class="fa fa-plus"></i></a>');
-	}
-});
-</script>
-<script id="treeselectTpl" type="text/template">//<!--<div>
-<#form:treeselect id="{{d.id}}" title="{{d.title}}" name="{{d.name}}" value="{{d.value}}"
-	labelName="{{d.labelName}}" labelValue="{{d.labelValue}}" url="{{d.url}}"
-	class="{{d.cssClass}}" btnClass="btn-sm" allowClear="true" readonly="{{d.readonly}}"/>
-</div>//--></script>
-<script id="listselectTpl" type="text/template">//<!--<div>
-<#form:listselect id="{{d.id}}" title="{{d.title}}" name="{{d.name}}" value="{{d.value}}"
-	labelName="{{d.labelName}}" labelValue="{{d.labelValue}}" url="{{d.url}}"
-	class="{{d.cssClass}}" btnClass="btn-sm" allowClear="true" readonly="{{d.readonly}}"
-	itemCode="{{d.itemCode}}" itemName="{{d.itemName}}"/>
-</div>//--></script>
-<script id="fileuploadTpl" type="text/template">//<!--<div>
-<#form:fileupload id="{{d.id}}" bizKey="{{d.bizKey}}" bizType="{{d.bizType}}" uploadType="all" 
-	class="{{d.cssClass}}" isMini="true" preview="true" readonly="{{d.readonly}}"/>
-</div>//--></script>
-<script>
-$('#inputForm').validate({
-	submitHandler: function(form){
-		js.ajaxSubmitForm($(form), function(data){
-			js.showMessage(data.message);
-			if(data.result == Global.TRUE){
-				js.closeCurrentTabPage(function(contentWindow){
-					contentWindow.page();
-				});
-			}
-		}, "json");
-    }
-});
-</script>
\ No newline at end of file
diff --git a/web/src/main/resources/views/modules/test/testTreeForm.html b/web/src/main/resources/views/modules/test/testTreeForm.html
deleted file mode 100644
index 730c6557..00000000
--- a/web/src/main/resources/views/modules/test/testTreeForm.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<% layout('/layouts/default.html', {title: '鏁版嵁绠＄悊', libs: ['validate','fileupload']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header with-border">
-			<div class="box-title">
-				<i class="fa icon-note"></i> ${text(testTree.isNewRecord ? '鏂板鏁版嵁' : '缂栬緫鏁版嵁')}
-			</div>
-			<div class="box-tools pull-right hide">
-				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-			</div>
-		</div>
-		<#form:form id="inputForm" model="${testTree}" action="${ctx}/test/testTree/save" method="post" class="form-horizontal">
-			<div class="box-body">
-				<div class="form-unit">${text('鍩烘湰淇℃伅')}</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4">${text('涓婄骇鏁版嵁')}锛�</label>
-							<div class="col-sm-8">
-								<#form:treeselect id="parent" title="${text('涓婄骇鏁版嵁')}"
-									path="parent.id" labelPath="parent.treeName"
-									url="${ctx}/test/testTree/treeData?excludeCode=${testTree.id}"
-									class="" allowClear="true" canSelectRoot="true" canSelectParent="true"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required ">*</span> ${text('鑺傜偣缂栫爜')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:hidden path="isNewRecord"/>
-								<#form:input path="treeCode" maxlength="64" readonly="${!testTree.isNewRecord}" class="form-control required abc"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required ">*</span> ${text('鑺傜偣鍚嶇О')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="treeName" maxlength="200" class="form-control required"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-								<span class="required ">*</span> ${text('鎺掑簭鍙�')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
-								<#form:input path="treeSort" class="form-control required digits"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2" title="">
-								<span class="required hide">*</span> ${text('澶囨敞淇℃伅')}锛�<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-10">
-								<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2">${text('鍥剧墖涓婁紶')}锛�</label>
-							<div class="col-sm-10">
-								<#form:fileupload id="uploadImage" bizKey="${testTree.id}" bizType="testTree_image"
-									uploadType="image" class="" readonly="false" preview="true"/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2">${text('闄勪欢涓婁紶')}锛�</label>
-							<div class="col-sm-10">
-								<#form:fileupload id="uploadFile" bizKey="${testTree.id}" bizType="testTree_file"
-									uploadType="all" class="" readonly="false" preview="true"/>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="box-footer">
-				<div class="row">
-					<div class="col-sm-offset-2 col-sm-10">
-						<% if (hasPermi('test:testTree:edit')){ %>
-							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> ${text('淇� 瀛�')}</button>&nbsp;
-						<% } %>
-						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> ${text('鍏� 闂�')}</button>
-					</div>
-				</div>
-			</div>
-		</#form:form>
-	</div>
-</div>
-<% } %>
-<script>
-$("#inputForm").validate({
-	submitHandler: function(form){
-		js.ajaxSubmitForm($(form), function(data){
-			js.showMessage(data.message);
-			if(data.result == Global.TRUE){
-				js.closeCurrentTabPage(function(contentWindow){
-					contentWindow.$('#dataGrid').dataGrid('refreshTreeChildren',
-							$('#parentCode').val(), '${testTree.id}');
-				});
-			}
-		}, "json");
-    }
-});
-
-// 閫夋嫨涓婄骇鑺傜偣鍥炶皟鏂规硶
-function treeselectCallback(id, act, index, layero){
-	if (id == 'parent' && (act == 'ok' || act == 'clear')){
-		// 鍒涘缓骞跺垵濮嬪寲涓嬩竴涓妭鐐逛俊鎭紝濡傦細鎺掑簭鍙枫�侀粯璁ゅ��
-		$.get('${ctx}/test/testTree/createNextNode?parentCode='
-				+$('#parentCode').val(), function(data){
-			$('#treeSort').val(data.treeSort);
-		});
-	}
-}
-</script>
\ No newline at end of file
diff --git a/web/src/main/resources/views/modules/test/testTreeList.html b/web/src/main/resources/views/modules/test/testTreeList.html
deleted file mode 100644
index d53bce32..00000000
--- a/web/src/main/resources/views/modules/test/testTreeList.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<% layout('/layouts/default.html', {title: '鏁版嵁绠＄悊', libs: ['dataGrid']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header">
-			<div class="box-title">
-				<i class="fa icon-notebook"></i> ${text('鏁版嵁绠＄悊')}
-			</div>
-			<div class="box-tools pull-right">
-				<a href="#" class="btn btn-default" id="btnSearch" title="${text('鏌ヨ')}"><i class="fa fa-filter"></i> ${text('鏌ヨ')}</a>
-				<a href="#" class="btn btn-default" id="btnRefreshTree" title="${text('鍒锋柊')}"><i class="fa fa-refresh"></i> ${text('鍒锋柊')}</a>
-				<a href="#" class="btn btn-default" id="btnExpandTreeNode" title="${text('灞曞紑涓�绾�')}"><i class="fa fa-angle-double-down"></i> ${text('灞曞紑')}</a>
-				<a href="#" class="btn btn-default" id="btnCollapseTreeNode" title="${text('鎶樺彔鍏ㄩ儴')}"><i class="fa fa-angle-double-up"></i> ${text('鎶樺彔')}</a>
-				<% if(hasPermi('test:testTree:edit')){ %>
-					<a href="${ctx}/test/testTree/form" class="btn btn-default btnTool" title="${text('鏂板鏁版嵁')}"><i class="fa fa-plus"></i> ${text('鏂板')}</a>
-					<a href="#" class="btn btn-default" id="btnFixTreeData" title="淇鏍戣〃鏁版嵁锛堝寘鍚瓧娈碉細parentCodes銆乼reeLeaf銆乼reeLevel銆乼reeSorts銆乼reeNames锛�"><i class="fa fa-refresh"></i> 淇</a>
-				<% } %>
-			</div>
-		</div>
-		<div class="box-body">
-			<#form:form id="searchForm" model="${testTree}" action="${ctx}/test/testTree/listData" method="post" class="form-inline hide"
-					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<div class="form-group">
-					<label class="control-label">${text('鑺傜偣鍚嶇О')}锛�</label>
-					<div class="control-inline">
-						<#form:input path="treeName" maxlength="200" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('澶囨敞淇℃伅')}锛�</label>
-					<div class="control-inline">
-						<#form:input path="remarks" maxlength="500" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('鐘舵��')}锛�</label>
-					<div class="control-inline width-120">
-						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<button type="submit" class="btn btn-primary btn-sm"><i class="glyphicon glyphicon-search"></i> ${text('鏌ヨ')}</button>
-					<button type="reset" class="btn btn-default btn-sm isQuick"><i class="glyphicon glyphicon-repeat"></i> ${text('閲嶇疆')}</button>
-				</div>
-			</#form:form>
-			<table id="dataGrid"></table>
-		</div>
-	</div>
-</div>
-<% } %>
-<script>
-//# // 鍒濆鍖朌ataGrid瀵硅薄
-$('#dataGrid').dataGrid({
-	searchForm: $("#searchForm"),
-	columnModel: [
-		{header:'${text("鑺傜偣鍚嶇О")}', name:'treeName', index:'a.tree_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
-			return '( '+row.treeCode+' ) '+'<a href="${ctx}/test/testTree/form?treeCode='+row.treeCode+'" class="btnList" data-title="${text("缂栬緫鏁版嵁")}">'+(val||row.id)+'</a>';
-		}},
-		{header:'${text("鎺掑簭鍙�")}', name:'treeSort', index:'a.tree_sort', width:150, align:"center"},
-		{header:'${text("鑺傜偣鍚嶇О")}', name:'treeName', index:'a.tree_name', width:150, align:"left"},
-		{header:'${text("鐘舵��")}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_search_status')}", val, '${text("鏈煡")}', true);
-		}},
-		{header:'${text("鍒涘缓鏃堕棿")}', name:'createDate', index:'a.create_date', width:150, align:"center"},
-		{header:'${text("澶囨敞淇℃伅")}', name:'remarks', index:'a.remarks', width:150, align:"left"},
-		{header:'${text("鎿嶄綔")}', name:'actions', width:120, formatter: function(val, obj, row, act){
-			var actions = [];
-			//# if(hasPermi('test:testTree:edit')){
-				actions.push('<a href="${ctx}/test/testTree/form?treeCode='+row.treeCode+'" class="btnList" title="${text("缂栬緫鏁版嵁")}"><i class="fa fa-pencil"></i></a>&nbsp;');
-				if (row.status == Global.STATUS_NORMAL){
-					actions.push('<a href="${ctx}/test/testTree/disable?treeCode='+row.treeCode+'" class="btnList" title="${text("鍋滅敤鏁版嵁")}" data-confirm="${text("纭瑕佸仠鐢ㄨ鏁版嵁鍚楋紵")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
-				} else if (row.status == Global.STATUS_DISABLE){
-					actions.push('<a href="${ctx}/test/testTree/enable?treeCode='+row.treeCode+'" class="btnList" title="${text("鍚敤鏁版嵁")}" data-confirm="${text("纭瑕佸惎鐢ㄨ鏁版嵁鍚楋紵")}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
-				}
-				actions.push('<a href="${ctx}/test/testTree/delete?treeCode='+row.treeCode+'" class="btnList" title="${text("鍒犻櫎鏁版嵁")}" data-confirm="${text("纭瑕佸垹闄よ鏁版嵁鍙婃墍鏈夊瓙鏁版嵁鍚楋紵")}" data-deltreenode="'+row.id+'"><i class="fa fa-trash-o"></i></a>&nbsp;');
-				actions.push('<a href="${ctx}/test/testTree/form?parentCode='+row.id+'" class="btnList" title="${text("鏂板涓嬬骇鏁版嵁")}"><i class="fa fa-plus-square"></i></a>&nbsp;');
-			//# }
-			return actions.join('');
-		}}
-	],
-	treeGrid: true,			// 鍚敤鏍戠粨鏋勮〃鏍�
-	defaultExpandLevel: 0,	// 榛樿灞曞紑鐨勫眰娆�
-	expandNodeClearPostData: 'treeName,remarks,', // 灞曞紑鑺傜偣娓呯悊璇锋眰鍙傛暟鏁版嵁锛堜竴鑸缃煡璇㈡潯浠剁殑瀛楁灞炴�э紝鍚﹀垯鍦ㄦ煡璇㈠悗锛屼笉鑳藉睍寮�瀛愯妭鐐规暟鎹級
-	//# // 鍔犺浇鎴愬姛鍚庢墽琛屼簨浠�
-	ajaxSuccess: function(data){
-		
-	}
-});
-
-//# // 淇鏍戣〃鏁版嵁锛堝寘鍚瓧娈碉細parentCodes銆乼reeLeaf銆乼reeLevel銆乼reeSorts銆乼reeNames锛�
-$("#btnFixTreeData").click(function(){ 
-	js.ajaxSubmit("${ctx}/test/testTree/fixTreeData", function(data){
-		js.showMessage(data.message);
-	});
-	return false;
-});
-</script>
\ No newline at end of file