Merge remote-tracking branch 'origin/master'

ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -40,18 +40,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
-		SELECT
+        SELECT
-			cast(A.NAME as nvarchar) as column_name,
+            cast(A.NAME as nvarchar) as column_name,
-			cast(B.NAME as nvarchar) as column_type,
+            cast(B.NAME as nvarchar) as column_type,
-			cast(G.[VALUE] as nvarchar) as column_comment
+            cast(G.[VALUE] as nvarchar) as column_comment,
-		FROM   SYSCOLUMNS   A
+            (SELECT 1  FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE Z  WHERE TABLE_NAME=D.NAME and A.NAME = Z.column_name  ) as is_pk
-			LEFT   JOIN   SYSTYPES   B   ON   A.XTYPE=B.XUSERTYPE
+        FROM   SYSCOLUMNS   A
-			INNER   JOIN   SYSOBJECTS   D   ON   A.ID=D.ID     AND   D.XTYPE='U'   AND     D.NAME!='DTPROPERTIES'
+            LEFT   JOIN   SYSTYPES   B   ON   A.XTYPE=B.XUSERTYPE
-			LEFT   JOIN   SYS.EXTENDED_PROPERTIES G   ON   A.ID=G.MAJOR_ID   AND   A.COLID=G.MINOR_ID
+            INNER   JOIN   SYSOBJECTS   D   ON   A.ID=D.ID     AND   D.XTYPE='U'   AND     D.NAME!='DTPROPERTIES'
-			LEFT   JOIN   SYS.EXTENDED_PROPERTIES F   ON   D.ID=F.MAJOR_ID   AND   F.MINOR_ID   =0
+            LEFT   JOIN   SYS.EXTENDED_PROPERTIES G   ON   A.ID=G.MAJOR_ID   AND   A.COLID=G.MINOR_ID
-		where   D.NAME = #{tableName}
+            LEFT   JOIN   SYS.EXTENDED_PROPERTIES F   ON   D.ID=F.MAJOR_ID   AND   F.MINOR_ID   =0
-		ORDER   BY   A.COLORDER
+        where   D.NAME = #{tableName}
-	</select>
+        ORDER   BY   A.COLORDER
+    </select>
     
     <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
         insert into gen_table_column (