Merge branch 'master' of https://github.com/elunez/eladmin

JinlongLiao · JinlongLiao · commit 84dc07821f73 · 2020-07-01T22:34:44.000+08:00
diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml
@@ -88,8 +88,8 @@ generator:
 #是否开启 swagger-ui
 swagger:
   enabled: true
-# IP 本地解析
 
+# IP 本地解析
 ip:
   local-parsing: true
 
diff --git a/sql/code_ 相关表字段调整.sql b/sql/code_ 相关表字段调整.sql
@@ -3,5 +3,5 @@ alter table code_gen_config CHANGE id config_id BIGINT(20) AUTO_INCREMENT COMMEN
 -- code_gen_config end --
 
 -- code_column_config 表改动 start --
-alter table code_column_config CHANGE id config_idcolumn_id BIGINT(20) AUTO_INCREMENT COMMENT 'ID';
+alter table code_column_config CHANGE id column_id BIGINT(20) AUTO_INCREMENT COMMENT 'ID';
 -- code_column_config end --
