diff --git a/modules/cms/db/cms.erm b/modules/cms/db/cms.erm
index 222c1125..af69b2b1 100644
--- a/modules/cms/db/cms.erm
+++ b/modules/cms/db/cms.erm
@@ -1923,7 +1923,7 @@
false
- 本级排序号(升序)
+ 排序号(升序)tree_sortdecimal(p)
@@ -1939,7 +1939,7 @@
false
- 所有级别排序号
+ 所有排序号tree_sortsvarchar(n)
diff --git a/modules/cms/db/mysql/cms.sql b/modules/cms/db/mysql/cms.sql
index b9db4d32..d9ddf305 100644
--- a/modules/cms/db/mysql/cms.sql
+++ b/modules/cms/db/mysql/cms.sql
@@ -90,8 +90,8 @@ CREATE TABLE js_cms_category
category_code varchar(64) NOT NULL COMMENT '栏目编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
- tree_sort decimal(10) NOT NULL COMMENT '本级排序号(升序)',
- tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+ tree_sort decimal(10) NOT NULL COMMENT '排序号(升序)',
+ tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
diff --git a/modules/cms/db/oracle/cms.sql b/modules/cms/db/oracle/cms.sql
index f76502ee..f8d71510 100644
--- a/modules/cms/db/oracle/cms.sql
+++ b/modules/cms/db/oracle/cms.sql
@@ -383,8 +383,8 @@ COMMENT ON TABLE js_cms_category IS '栏目表';
COMMENT ON COLUMN js_cms_category.category_code IS '栏目编码';
COMMENT ON COLUMN js_cms_category.parent_code IS '父级编号';
COMMENT ON COLUMN js_cms_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_cms_category.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN js_cms_category.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN js_cms_category.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_cms_category.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_cms_category.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_cms_category.tree_level IS '层次级别';
COMMENT ON COLUMN js_cms_category.tree_names IS '全节点名';
diff --git a/modules/cms/db/postgresql/cms.sql b/modules/cms/db/postgresql/cms.sql
index f5b69988..495f42fc 100644
--- a/modules/cms/db/postgresql/cms.sql
+++ b/modules/cms/db/postgresql/cms.sql
@@ -383,8 +383,8 @@ COMMENT ON TABLE js_cms_category IS '栏目表';
COMMENT ON COLUMN js_cms_category.category_code IS '栏目编码';
COMMENT ON COLUMN js_cms_category.parent_code IS '父级编号';
COMMENT ON COLUMN js_cms_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_cms_category.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN js_cms_category.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN js_cms_category.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_cms_category.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_cms_category.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_cms_category.tree_level IS '层次级别';
COMMENT ON COLUMN js_cms_category.tree_names IS '全节点名';
diff --git a/modules/cms/src/main/resources/db/create/mysql/cms.sql b/modules/cms/src/main/resources/db/create/mysql/cms.sql
index 6ac402ec..a84b77a1 100644
--- a/modules/cms/src/main/resources/db/create/mysql/cms.sql
+++ b/modules/cms/src/main/resources/db/create/mysql/cms.sql
@@ -90,8 +90,8 @@ CREATE TABLE ${_prefix}cms_category
category_code varchar(64) NOT NULL COMMENT '栏目编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
- tree_sort decimal(10) NOT NULL COMMENT '本级排序号(升序)',
- tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+ tree_sort decimal(10) NOT NULL COMMENT '排序号(升序)',
+ tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
diff --git a/modules/cms/src/main/resources/db/create/oracle/cms.sql b/modules/cms/src/main/resources/db/create/oracle/cms.sql
index 56005f2c..7f7479a5 100644
--- a/modules/cms/src/main/resources/db/create/oracle/cms.sql
+++ b/modules/cms/src/main/resources/db/create/oracle/cms.sql
@@ -383,8 +383,8 @@ COMMENT ON TABLE ${_prefix}cms_category IS '栏目表';
COMMENT ON COLUMN ${_prefix}cms_category.category_code IS '栏目编码';
COMMENT ON COLUMN ${_prefix}cms_category.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}cms_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}cms_category.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN ${_prefix}cms_category.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN ${_prefix}cms_category.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN ${_prefix}cms_category.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}cms_category.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}cms_category.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}cms_category.tree_names IS '全节点名';
diff --git a/modules/cms/src/main/resources/db/create/postgresql/cms.sql b/modules/cms/src/main/resources/db/create/postgresql/cms.sql
index a0030212..0603c394 100644
--- a/modules/cms/src/main/resources/db/create/postgresql/cms.sql
+++ b/modules/cms/src/main/resources/db/create/postgresql/cms.sql
@@ -383,8 +383,8 @@ COMMENT ON TABLE ${_prefix}cms_category IS '栏目表';
COMMENT ON COLUMN ${_prefix}cms_category.category_code IS '栏目编码';
COMMENT ON COLUMN ${_prefix}cms_category.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}cms_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}cms_category.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN ${_prefix}cms_category.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN ${_prefix}cms_category.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN ${_prefix}cms_category.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}cms_category.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}cms_category.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}cms_category.tree_names IS '全节点名';
diff --git a/modules/cms/src/main/resources/views/modules/cms/categoryForm.html b/modules/cms/src/main/resources/views/modules/cms/categoryForm.html
index f148b859..9a60e3d8 100644
--- a/modules/cms/src/main/resources/views/modules/cms/categoryForm.html
+++ b/modules/cms/src/main/resources/views/modules/cms/categoryForm.html
@@ -69,7 +69,7 @@
diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm
index f97437cc..8c4362f0 100644
--- a/modules/core/db/core.erm
+++ b/modules/core/db/core.erm
@@ -3923,7 +3923,7 @@
false
- 本级排序号(升序)
+ 排序号(升序)tree_sortdecimal(p)
@@ -3939,7 +3939,7 @@
false
- 所有级别排序号
+ 所有排序号tree_sortsvarchar(n)
diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql
index 3a586227..46e7b7b4 100644
--- a/modules/core/db/mysql/core.sql
+++ b/modules/core/db/mysql/core.sql
@@ -62,8 +62,8 @@ CREATE TABLE js_sys_area
area_code varchar(100) NOT NULL COMMENT '区域编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
- tree_sort decimal(10) NOT NULL COMMENT '本级排序号(升序)',
- tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+ tree_sort decimal(10) NOT NULL COMMENT '排序号(升序)',
+ tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -85,8 +85,8 @@ CREATE TABLE js_sys_company
company_code varchar(64) NOT NULL COMMENT '公司编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
- tree_sort decimal(10) NOT NULL COMMENT '本级排序号(升序)',
- tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+ tree_sort decimal(10) NOT NULL COMMENT '排序号(升序)',
+ tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -158,8 +158,8 @@ CREATE TABLE js_sys_dict_data
dict_code varchar(64) NOT NULL COMMENT '字典编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
- tree_sort decimal(10) NOT NULL COMMENT '本级排序号(升序)',
- tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+ tree_sort decimal(10) NOT NULL COMMENT '排序号(升序)',
+ tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -407,8 +407,8 @@ CREATE TABLE js_sys_menu
menu_code varchar(64) NOT NULL COMMENT '菜单编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
- tree_sort decimal(10) NOT NULL COMMENT '本级排序号(升序)',
- tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+ tree_sort decimal(10) NOT NULL COMMENT '排序号(升序)',
+ tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -596,8 +596,8 @@ CREATE TABLE js_sys_office
office_code varchar(64) NOT NULL COMMENT '机构编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
- tree_sort decimal(10) NOT NULL COMMENT '本级排序号(升序)',
- tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+ tree_sort decimal(10) NOT NULL COMMENT '排序号(升序)',
+ tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql
index c6925d8f..83333f2b 100644
--- a/modules/core/db/oracle/core.sql
+++ b/modules/core/db/oracle/core.sql
@@ -986,8 +986,8 @@ COMMENT ON TABLE js_sys_area IS '行政区划';
COMMENT ON COLUMN js_sys_area.area_code IS '区域编码';
COMMENT ON COLUMN js_sys_area.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_area.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_sys_area.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN js_sys_area.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN js_sys_area.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_sys_area.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_area.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_area.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_area.tree_names IS '全节点名';
@@ -1003,8 +1003,8 @@ COMMENT ON TABLE js_sys_company IS '公司表';
COMMENT ON COLUMN js_sys_company.company_code IS '公司编码';
COMMENT ON COLUMN js_sys_company.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_company.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_sys_company.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN js_sys_company.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN js_sys_company.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_sys_company.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_company.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_company.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_company.tree_names IS '全节点名';
@@ -1058,8 +1058,8 @@ COMMENT ON TABLE js_sys_dict_data IS '字典数据表';
COMMENT ON COLUMN js_sys_dict_data.dict_code IS '字典编码';
COMMENT ON COLUMN js_sys_dict_data.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_dict_data.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_sys_dict_data.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN js_sys_dict_data.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN js_sys_dict_data.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_sys_dict_data.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_dict_data.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_dict_data.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_dict_data.tree_names IS '全节点名';
@@ -1241,8 +1241,8 @@ COMMENT ON TABLE js_sys_menu IS '菜单表';
COMMENT ON COLUMN js_sys_menu.menu_code IS '菜单编码';
COMMENT ON COLUMN js_sys_menu.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_menu.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_sys_menu.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN js_sys_menu.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN js_sys_menu.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_sys_menu.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_menu.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_menu.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_menu.tree_names IS '全节点名';
@@ -1388,8 +1388,8 @@ COMMENT ON TABLE js_sys_office IS '组织机构表';
COMMENT ON COLUMN js_sys_office.office_code IS '机构编码';
COMMENT ON COLUMN js_sys_office.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_office.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_sys_office.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN js_sys_office.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN js_sys_office.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_sys_office.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_office.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_office.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_office.tree_names IS '全节点名';
diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql
index 8e5558a3..99bc9fa5 100644
--- a/modules/core/db/postgresql/core.sql
+++ b/modules/core/db/postgresql/core.sql
@@ -986,8 +986,8 @@ COMMENT ON TABLE js_sys_area IS '行政区划';
COMMENT ON COLUMN js_sys_area.area_code IS '区域编码';
COMMENT ON COLUMN js_sys_area.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_area.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_sys_area.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN js_sys_area.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN js_sys_area.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_sys_area.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_area.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_area.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_area.tree_names IS '全节点名';
@@ -1003,8 +1003,8 @@ COMMENT ON TABLE js_sys_company IS '公司表';
COMMENT ON COLUMN js_sys_company.company_code IS '公司编码';
COMMENT ON COLUMN js_sys_company.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_company.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_sys_company.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN js_sys_company.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN js_sys_company.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_sys_company.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_company.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_company.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_company.tree_names IS '全节点名';
@@ -1058,8 +1058,8 @@ COMMENT ON TABLE js_sys_dict_data IS '字典数据表';
COMMENT ON COLUMN js_sys_dict_data.dict_code IS '字典编码';
COMMENT ON COLUMN js_sys_dict_data.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_dict_data.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_sys_dict_data.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN js_sys_dict_data.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN js_sys_dict_data.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_sys_dict_data.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_dict_data.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_dict_data.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_dict_data.tree_names IS '全节点名';
@@ -1241,8 +1241,8 @@ COMMENT ON TABLE js_sys_menu IS '菜单表';
COMMENT ON COLUMN js_sys_menu.menu_code IS '菜单编码';
COMMENT ON COLUMN js_sys_menu.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_menu.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_sys_menu.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN js_sys_menu.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN js_sys_menu.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_sys_menu.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_menu.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_menu.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_menu.tree_names IS '全节点名';
@@ -1388,8 +1388,8 @@ COMMENT ON TABLE js_sys_office IS '组织机构表';
COMMENT ON COLUMN js_sys_office.office_code IS '机构编码';
COMMENT ON COLUMN js_sys_office.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_office.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_sys_office.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN js_sys_office.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN js_sys_office.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_sys_office.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_office.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_office.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_office.tree_names IS '全节点名';
diff --git a/modules/core/src/main/resources/db/create/mysql/core.sql b/modules/core/src/main/resources/db/create/mysql/core.sql
index 9edf0d42..91e80301 100644
--- a/modules/core/src/main/resources/db/create/mysql/core.sql
+++ b/modules/core/src/main/resources/db/create/mysql/core.sql
@@ -62,8 +62,8 @@ CREATE TABLE ${_prefix}sys_area
area_code varchar(100) NOT NULL COMMENT '区域编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
- tree_sort decimal(10) NOT NULL COMMENT '本级排序号(升序)',
- tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+ tree_sort decimal(10) NOT NULL COMMENT '排序号(升序)',
+ tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -85,8 +85,8 @@ CREATE TABLE ${_prefix}sys_company
company_code varchar(64) NOT NULL COMMENT '公司编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
- tree_sort decimal(10) NOT NULL COMMENT '本级排序号(升序)',
- tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+ tree_sort decimal(10) NOT NULL COMMENT '排序号(升序)',
+ tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -158,8 +158,8 @@ CREATE TABLE ${_prefix}sys_dict_data
dict_code varchar(64) NOT NULL COMMENT '字典编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
- tree_sort decimal(10) NOT NULL COMMENT '本级排序号(升序)',
- tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+ tree_sort decimal(10) NOT NULL COMMENT '排序号(升序)',
+ tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -407,8 +407,8 @@ CREATE TABLE ${_prefix}sys_menu
menu_code varchar(64) NOT NULL COMMENT '菜单编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
- tree_sort decimal(10) NOT NULL COMMENT '本级排序号(升序)',
- tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+ tree_sort decimal(10) NOT NULL COMMENT '排序号(升序)',
+ tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -596,8 +596,8 @@ CREATE TABLE ${_prefix}sys_office
office_code varchar(64) NOT NULL COMMENT '机构编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
- tree_sort decimal(10) NOT NULL COMMENT '本级排序号(升序)',
- tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+ tree_sort decimal(10) NOT NULL COMMENT '排序号(升序)',
+ tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
diff --git a/modules/core/src/main/resources/db/create/oracle/core.sql b/modules/core/src/main/resources/db/create/oracle/core.sql
index abf628f6..eeea5f4c 100644
--- a/modules/core/src/main/resources/db/create/oracle/core.sql
+++ b/modules/core/src/main/resources/db/create/oracle/core.sql
@@ -986,8 +986,8 @@ COMMENT ON TABLE ${_prefix}sys_area IS '行政区划';
COMMENT ON COLUMN ${_prefix}sys_area.area_code IS '区域编码';
COMMENT ON COLUMN ${_prefix}sys_area.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_area.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}sys_area.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN ${_prefix}sys_area.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN ${_prefix}sys_area.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN ${_prefix}sys_area.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_area.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_area.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_area.tree_names IS '全节点名';
@@ -1003,8 +1003,8 @@ COMMENT ON TABLE ${_prefix}sys_company IS '公司表';
COMMENT ON COLUMN ${_prefix}sys_company.company_code IS '公司编码';
COMMENT ON COLUMN ${_prefix}sys_company.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_company.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}sys_company.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN ${_prefix}sys_company.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN ${_prefix}sys_company.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN ${_prefix}sys_company.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_company.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_company.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_company.tree_names IS '全节点名';
@@ -1058,8 +1058,8 @@ COMMENT ON TABLE ${_prefix}sys_dict_data IS '字典数据表';
COMMENT ON COLUMN ${_prefix}sys_dict_data.dict_code IS '字典编码';
COMMENT ON COLUMN ${_prefix}sys_dict_data.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_dict_data.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_names IS '全节点名';
@@ -1241,8 +1241,8 @@ COMMENT ON TABLE ${_prefix}sys_menu IS '菜单表';
COMMENT ON COLUMN ${_prefix}sys_menu.menu_code IS '菜单编码';
COMMENT ON COLUMN ${_prefix}sys_menu.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_menu.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}sys_menu.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN ${_prefix}sys_menu.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN ${_prefix}sys_menu.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN ${_prefix}sys_menu.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_names IS '全节点名';
@@ -1388,8 +1388,8 @@ COMMENT ON TABLE ${_prefix}sys_office IS '组织机构表';
COMMENT ON COLUMN ${_prefix}sys_office.office_code IS '机构编码';
COMMENT ON COLUMN ${_prefix}sys_office.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_office.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}sys_office.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN ${_prefix}sys_office.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN ${_prefix}sys_office.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN ${_prefix}sys_office.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_office.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_office.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_office.tree_names IS '全节点名';
diff --git a/modules/core/src/main/resources/db/create/postgresql/core.sql b/modules/core/src/main/resources/db/create/postgresql/core.sql
index 446250de..d2ebd50f 100644
--- a/modules/core/src/main/resources/db/create/postgresql/core.sql
+++ b/modules/core/src/main/resources/db/create/postgresql/core.sql
@@ -986,8 +986,8 @@ COMMENT ON TABLE ${_prefix}sys_area IS '行政区划';
COMMENT ON COLUMN ${_prefix}sys_area.area_code IS '区域编码';
COMMENT ON COLUMN ${_prefix}sys_area.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_area.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}sys_area.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN ${_prefix}sys_area.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN ${_prefix}sys_area.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN ${_prefix}sys_area.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_area.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_area.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_area.tree_names IS '全节点名';
@@ -1003,8 +1003,8 @@ COMMENT ON TABLE ${_prefix}sys_company IS '公司表';
COMMENT ON COLUMN ${_prefix}sys_company.company_code IS '公司编码';
COMMENT ON COLUMN ${_prefix}sys_company.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_company.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}sys_company.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN ${_prefix}sys_company.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN ${_prefix}sys_company.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN ${_prefix}sys_company.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_company.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_company.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_company.tree_names IS '全节点名';
@@ -1058,8 +1058,8 @@ COMMENT ON TABLE ${_prefix}sys_dict_data IS '字典数据表';
COMMENT ON COLUMN ${_prefix}sys_dict_data.dict_code IS '字典编码';
COMMENT ON COLUMN ${_prefix}sys_dict_data.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_dict_data.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_names IS '全节点名';
@@ -1241,8 +1241,8 @@ COMMENT ON TABLE ${_prefix}sys_menu IS '菜单表';
COMMENT ON COLUMN ${_prefix}sys_menu.menu_code IS '菜单编码';
COMMENT ON COLUMN ${_prefix}sys_menu.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_menu.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}sys_menu.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN ${_prefix}sys_menu.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN ${_prefix}sys_menu.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN ${_prefix}sys_menu.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_names IS '全节点名';
@@ -1388,8 +1388,8 @@ COMMENT ON TABLE ${_prefix}sys_office IS '组织机构表';
COMMENT ON COLUMN ${_prefix}sys_office.office_code IS '机构编码';
COMMENT ON COLUMN ${_prefix}sys_office.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_office.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}sys_office.tree_sort IS '本级排序号(升序)';
-COMMENT ON COLUMN ${_prefix}sys_office.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN ${_prefix}sys_office.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN ${_prefix}sys_office.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_office.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_office.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_office.tree_names IS '全节点名';
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml b/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml
index dea4513a..be8061f8 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml
@@ -970,7 +970,7 @@
false
- 本级排序号(升序)
+ 排序号(升序)tree_sortdecimal(p)
@@ -986,7 +986,7 @@
false
- 所有级别排序号
+ 所有排序号tree_sortsvarchar(n)
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml
index acb138e0..bb95540e 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml
@@ -970,7 +970,7 @@
false
- 本级排序号(升序)
+ 排序号(升序)tree_sortdecimal(p)
@@ -986,7 +986,7 @@
false
- 所有级别排序号
+ 所有排序号tree_sortsvarchar(n)
diff --git a/modules/template/db/template.erm b/modules/template/db/template.erm
index 73ee8a63..1c9ab28d 100644
--- a/modules/template/db/template.erm
+++ b/modules/template/db/template.erm
@@ -963,7 +963,7 @@
false
- 本级排序号(升序)
+ 排序号(升序)tree_sortdecimal(p)
@@ -979,7 +979,7 @@
false
- 所有级别排序号
+ 所有排序号tree_sortsvarchar(n)
diff --git a/web/bin/docker-bulid.bat b/web/bin/docker-build.bat
similarity index 100%
rename from web/bin/docker-bulid.bat
rename to web/bin/docker-build.bat
diff --git a/web/bin/docker-bulid.sh b/web/bin/docker-build.sh
similarity index 100%
rename from web/bin/docker-bulid.sh
rename to web/bin/docker-build.sh
diff --git a/web/db/mysql/test.sql b/web/db/mysql/test.sql
index 3638aa1d..3165078a 100644
--- a/web/db/mysql/test.sql
+++ b/web/db/mysql/test.sql
@@ -57,8 +57,8 @@ CREATE TABLE test_tree
tree_code varchar(64) NOT NULL COMMENT '节点编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
- tree_sort decimal(10) NOT NULL COMMENT '本级排序号(升序)',
- tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+ tree_sort decimal(10) NOT NULL COMMENT '排序号(升序)',
+ tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
diff --git a/web/db/oracle/test.sql b/web/db/oracle/test.sql
index 165e7a89..0ffbb56d 100644
--- a/web/db/oracle/test.sql
+++ b/web/db/oracle/test.sql
@@ -115,8 +115,8 @@ 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_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 '全节点名';
diff --git a/web/db/postgresql/test.sql b/web/db/postgresql/test.sql
index 165fb09f..15f53ad5 100644
--- a/web/db/postgresql/test.sql
+++ b/web/db/postgresql/test.sql
@@ -115,8 +115,8 @@ 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_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 '全节点名';
diff --git a/web/db/test.erm b/web/db/test.erm
index e687789a..e3f14529 100644
--- a/web/db/test.erm
+++ b/web/db/test.erm
@@ -963,7 +963,7 @@
false
- 本级排序号(升序)
+ 排序号(升序)tree_sortdecimal(p)
@@ -979,7 +979,7 @@
false
- 所有级别排序号
+ 所有排序号tree_sortsvarchar(n)
diff --git a/web/src/main/resources/db/create/mysql/test.sql b/web/src/main/resources/db/create/mysql/test.sql
index 3638aa1d..3165078a 100644
--- a/web/src/main/resources/db/create/mysql/test.sql
+++ b/web/src/main/resources/db/create/mysql/test.sql
@@ -57,8 +57,8 @@ CREATE TABLE test_tree
tree_code varchar(64) NOT NULL COMMENT '节点编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
- tree_sort decimal(10) NOT NULL COMMENT '本级排序号(升序)',
- tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+ tree_sort decimal(10) NOT NULL COMMENT '排序号(升序)',
+ tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
diff --git a/web/src/main/resources/db/create/oracle/test.sql b/web/src/main/resources/db/create/oracle/test.sql
index 165e7a89..0ffbb56d 100644
--- a/web/src/main/resources/db/create/oracle/test.sql
+++ b/web/src/main/resources/db/create/oracle/test.sql
@@ -115,8 +115,8 @@ 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_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 '全节点名';
diff --git a/web/src/main/resources/db/create/postgresql/test.sql b/web/src/main/resources/db/create/postgresql/test.sql
index 165fb09f..15f53ad5 100644
--- a/web/src/main/resources/db/create/postgresql/test.sql
+++ b/web/src/main/resources/db/create/postgresql/test.sql
@@ -115,8 +115,8 @@ 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_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 '全节点名';
diff --git a/web/src/main/resources/views/modules/test/testTreeForm.html b/web/src/main/resources/views/modules/test/testTreeForm.html
index 0668af88..8c3ad58d 100644
--- a/web/src/main/resources/views/modules/test/testTreeForm.html
+++ b/web/src/main/resources/views/modules/test/testTreeForm.html
@@ -48,7 +48,7 @@