diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..e7b1f968e802b28a751cc38b36619ccf74165f67
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,7 @@
+
+.gitee
+db
+log
+script
+templates
+front/node_modules
\ No newline at end of file
diff --git a/gen/src/main/java/com/gitee/gen/gen/mysql/MySqlColumnSelector.java b/gen/src/main/java/com/gitee/gen/gen/mysql/MySqlColumnSelector.java
index 4748e14ac11fa989a8e1a3305ae7c063a82f57c9..540bcfe91874fd0df77f0b8bc65443552b2661f1 100644
--- a/gen/src/main/java/com/gitee/gen/gen/mysql/MySqlColumnSelector.java
+++ b/gen/src/main/java/com/gitee/gen/gen/mysql/MySqlColumnSelector.java
@@ -34,7 +34,8 @@ public class MySqlColumnSelector extends ColumnSelector {
 			" EXTRA AS 'Extra', " +
 			" COLUMN_COMMENT AS 'Comment' " +
 			" FROM information_schema.`COLUMNS` " +
-			" WHERE 1=1 AND TABLE_SCHEMA = '%s' AND TABLE_NAME = '%s' ";
+			" WHERE 1=1 AND TABLE_SCHEMA = '%s' AND TABLE_NAME = '%s' " +
+			" ORDER BY ORDINAL_POSITION";
 
 	public MySqlColumnSelector(GeneratorConfig generatorConfig) {
 		super(generatorConfig);
diff --git a/gen/src/main/java/com/gitee/gen/gen/postgresql/PostgreSqlColumnSelector.java b/gen/src/main/java/com/gitee/gen/gen/postgresql/PostgreSqlColumnSelector.java
index e08903b2aab0cd7b36fb99980278dec379e31ac2..ff7c7dd9ef1874ead411822f6a5e4f39c80a5fd1 100644
--- a/gen/src/main/java/com/gitee/gen/gen/postgresql/PostgreSqlColumnSelector.java
+++ b/gen/src/main/java/com/gitee/gen/gen/postgresql/PostgreSqlColumnSelector.java
@@ -32,7 +32,7 @@ public class PostgreSqlColumnSelector extends ColumnSelector {
             "CASE WHEN POSITION ( 'nextval' IN column_default ) > 0 THEN 1 ELSE 0 END AS is_identity  " +
             "FROM  " +
             " pg_constraint  " +
-            " RIGHT JOIN pg_class ON pg_constraint.conrelid = pg_class.oid  " +
+            " RIGHT JOIN pg_class ON pg_constraint.conrelid = pg_class.oid and pg_constraint.contype = 'p' " +
             " RIGHT JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid  " +
             " RIGHT JOIN pg_type ON pg_type.oid = pg_attribute.atttypid  " +
             " RIGHT JOIN information_schema.COLUMNS C ON C.TABLE_NAME = pg_class.relname   " +