diff --git a/internal/consts/version.go b/internal/consts/version.go index 05ff019..96e2bcd 100644 --- a/internal/consts/version.go +++ b/internal/consts/version.go @@ -9,5 +9,5 @@ package consts const ( Logo = `CiAgIF9fX19fX19fX19fXyAgICAgICAgICAgX18gCiAgLyBfX19fLyBfX19fL19fXyBfX19fX18vIC9fCiAvIC8gX18vIC9fICAvIF9fIGAvIF9fXy8gX18vCi8gL18vIC8gX18vIC8gL18vIChfXyAgKSAvXyAgClxfX19fL18vICAgIFxfXyxfL19fX18vXF9fLyAg` - Version = "3.2.22" + Version = "3.2.23" ) diff --git a/library/liberr/err.go b/library/liberr/err.go index dd5ec83..71205ff 100644 --- a/library/liberr/err.go +++ b/library/liberr/err.go @@ -18,7 +18,7 @@ func ErrIsNil(ctx context.Context, err error, msg ...string) { g.Log().Error(ctx, err.Error()) panic(msg[0]) } else { - panic(err.Error()) + panic(err) } } } diff --git a/resource/data/gfast-v32-pg.sql b/resource/data/gfast-v32-pg.sql index 7dee9c2..ba1fa55 100644 --- a/resource/data/gfast-v32-pg.sql +++ b/resource/data/gfast-v32-pg.sql @@ -5010,7 +5010,7 @@ CREATE TABLE "sys_role" ( "updated_at" timestamp(6), "created_by" int8 NOT NULL DEFAULT 0, "pid" int8 NOT NULL DEFAULT 0, - "effectiveTime" text COLLATE "pg_catalog"."default" + "effective_time" text COLLATE "pg_catalog"."default" ) ; COMMENT ON COLUMN "sys_role"."status" IS '状态;0:禁用;1:正常'; @@ -5022,7 +5022,7 @@ COMMENT ON COLUMN "sys_role"."created_at" IS '创建时间'; COMMENT ON COLUMN "sys_role"."updated_at" IS '更新时间'; COMMENT ON COLUMN "sys_role"."created_by" IS '添加人'; COMMENT ON COLUMN "sys_role"."pid" IS '父级ID'; -COMMENT ON COLUMN "sys_role"."effectiveTime" IS '角色有效日期'; +COMMENT ON COLUMN "sys_role"."effective_time" IS '角色有效日期'; COMMENT ON TABLE "sys_role" IS '角色表'; -- ---------------------------- diff --git a/resource/template/vm/vue/list-vue.template b/resource/template/vm/vue/list-vue.template index 54ff54f..91607ef 100644 --- a/resource/template/vm/vue/list-vue.template +++ b/resource/template/vm/vue/list-vue.template @@ -47,7 +47,7 @@ {{else if and (eq $column.HtmlType "select" "radio" "checkbox" "selects") (ne $column.DictType "") }} - + - + - + diff --git a/resource/template/vm/vue/tree-virtual-vue.template b/resource/template/vm/vue/tree-virtual-vue.template index 40f1d9b..967f94a 100644 --- a/resource/template/vm/vue/tree-virtual-vue.template +++ b/resource/template/vm/vue/tree-virtual-vue.template @@ -52,7 +52,7 @@ {{else if and (eq $column.HtmlType "select" "radio" "checkbox" "selects") (ne $column.DictType "") }} - + - + - + diff --git a/resource/template/vm/vue/tree-vue.template b/resource/template/vm/vue/tree-vue.template index d24664c..0a498ce 100644 --- a/resource/template/vm/vue/tree-vue.template +++ b/resource/template/vm/vue/tree-vue.template @@ -50,7 +50,7 @@ {{else if and (eq $column.HtmlType "select" "radio" "checkbox" "selects") (ne $column.DictType "") }} - + - + - +