Merge pull request #30 from xgdd1987/dev

Update MakeModelCommand.php  查询表字段sql增加ORDER BY ordinal_position排序。

Author: walkor

src/Commands/MakeModelCommand.php

@@ -114,7 +114,7 @@ protected function createModel($class, $namespace, $file)
                 $comments = $tableComment[0]->table_comment ?? $tableComment[0]->TABLE_COMMENT;
                 $properties .= " * {$table} {$comments}" . PHP_EOL;
             }
-            foreach (\support\Db::select("select COLUMN_NAME,DATA_TYPE,COLUMN_KEY,COLUMN_COMMENT from INFORMATION_SCHEMA.COLUMNS where table_name = '$table' and table_schema = '$database'") as $item) {
+            foreach (\support\Db::select("select COLUMN_NAME,DATA_TYPE,COLUMN_KEY,COLUMN_COMMENT from INFORMATION_SCHEMA.COLUMNS where table_name = '$table' and table_schema = '$database' ORDER BY ordinal_position") as $item) {
                 if ($item->COLUMN_KEY === 'PRI') {
                     $pk = $item->COLUMN_NAME;
                     $item->COLUMN_COMMENT .= "(主键)";
@@ -196,7 +196,7 @@ protected function createTpModel($class, $namespace, $file)
                 $comments = $tableComment[0]['table_comment'] ?? $tableComment[0]['TABLE_COMMENT'];
                 $properties .= " * {$table} {$comments}" . PHP_EOL;
             }
-            foreach (\think\facade\Db::query("select COLUMN_NAME,DATA_TYPE,COLUMN_KEY,COLUMN_COMMENT from INFORMATION_SCHEMA.COLUMNS where table_name = '$table' and table_schema = '$database'") as $item) {
+            foreach (\think\facade\Db::query("select COLUMN_NAME,DATA_TYPE,COLUMN_KEY,COLUMN_COMMENT from INFORMATION_SCHEMA.COLUMNS where table_name = '$table' and table_schema = '$database' ORDER BY ordinal_position") as $item) {
                 if ($item['COLUMN_KEY'] === 'PRI') {
                     $pk = $item['COLUMN_NAME'];
                     $item['COLUMN_COMMENT'] .= "(主键)";