From af2459b1ca06a945809affb06c37c174624a40ca Mon Sep 17 00:00:00 2001
From: usr1999 <330896202@qq.com>
Date: Fri, 6 Dec 2019 13:52:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=94=AF=E6=8C=8111=E4=BD=8D=E9=95=BF=E5=BA=A6int=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/generator/util/GenUtils.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
index 4f04e8fbc..2b592f91f 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -65,7 +65,7 @@ public class GenUtils
                 column.setJavaType(GenConstants.TYPE_DOUBLE);
             }
             // 如果是整形
-            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)
+            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 11)
             {
                 column.setJavaType(GenConstants.TYPE_INTEGER);
             }

From 4235c8cfe5e82eedf5b649fdb081d2724cca827e Mon Sep 17 00:00:00 2001
From: usr1999 <330896202@qq.com>
Date: Fri, 6 Dec 2019 13:54:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=87=AA=E5=A2=9E=E4=B8=BB=E9=94=AE=E5=88=A4=E6=96=AD=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=82=E6=95=B0=E5=86=99=E9=94=99=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
index fb5a618be..652a776bc 100644
--- a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
+++ b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 #end
     </select>
         
-    <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
+    <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.isIncrement) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
         insert into ${tableName}
         <trim prefix="(" suffix=")" suffixOverrides=",">
 #foreach($column in $columns)