Merge remote-tracking branch 'ruoyi/master'

# Conflicts: # README.md # ruoyi-ui/package.json # ruoyi-ui/src/assets/styles/index.scss # ruoyi-ui/src/utils/generator/js.js # ruoyi-ui/src/views/index.vue # ruoyi-ui/vue.config.js
2023-07-12 08:53:31 +08:00
parent 5db00f34a0 a0595711ca
commit c92a2f1c15
38 changed files with 459 additions and 288 deletions
--- a/sql/ry_20230706.sql
+++ b/sql/ry_20230706.sql
@@ -674,7 +674,7 @@ create table gen_table (
 drop table if exists gen_table_column;
 create table gen_table_column (
  column_id         bigint(20)      not null auto_increment    comment '编号',
-  table_id          varchar(64)                                comment '归属表编号',
+  table_id          bigint(20)                                 comment '归属表编号',
  column_name       varchar(200)                               comment '列名称',
  column_comment    varchar(500)                               comment '列描述',
  column_type       varchar(100)                               comment '列类型',