From b2825cfa1f9f94ea175f6427f71a46aa2709ff6e Mon Sep 17 00:00:00 2001
From: sxile <3440626@qq.com>
Date: Wed, 13 Nov 2019 18:13:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A8=A1=E5=9D=97=E5=AF=BC=E5=85=A5=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E5=AD=97=E6=AE=B5sort=E4=B8=BAnull=E7=9A=84b?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/generator/GenTableColumnMapper.xml   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
index b6e8d1a..e40de93 100644
--- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -44,7 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cast(A.NAME as nvarchar) as column_name,
             cast(B.NAME as nvarchar) + (case when B.NAME ='numeric' then '('+cast(A.prec as nvarchar)+','+cast(A.scale as nvarchar)+')' else '' end) as column_type,
             cast(G.[VALUE] as nvarchar) as column_comment,
-            (SELECT 1  FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE Z  WHERE TABLE_NAME=D.NAME and A.NAME = Z.column_name  ) as is_pk
+            (SELECT 1  FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE Z  WHERE TABLE_NAME=D.NAME and A.NAME = Z.column_name  ) as is_pk,
+            colorder as sort
         FROM   SYSCOLUMNS   A
             LEFT   JOIN   SYSTYPES   B   ON   A.XTYPE=B.XUSERTYPE
             INNER   JOIN   SYSOBJECTS   D   ON   A.ID=D.ID     AND   D.XTYPE='U'   AND     D.NAME!='DTPROPERTIES'