Merge remote-tracking branch 'origin/master'

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

@@ -43,7 +43,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             cast(A.NAME as nvarchar) as column_name,
             cast(B.NAME as nvarchar) as column_type,
-			cast(G.[VALUE] as nvarchar) as column_comment
+            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
         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'