From ebdc1cc806f124323b031ca7c1ed43e742bfb189 Mon Sep 17 00:00:00 2001
From: williamjava <wuhoujian@126.com>
Date: Mon, 24 Dec 2018 09:11:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E5=90=8E=E8=BF=94=E5=9B=9E=E4=B8=BB=E9=94=AEID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star/star-dal/src/main/java/com/gui/star/dal/model/User.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/star/star-dal/src/main/java/com/gui/star/dal/model/User.java b/star/star-dal/src/main/java/com/gui/star/dal/model/User.java
index f55e91c..46ffce8 100644
--- a/star/star-dal/src/main/java/com/gui/star/dal/model/User.java
+++ b/star/star-dal/src/main/java/com/gui/star/dal/model/User.java
@@ -7,6 +7,10 @@
 import javax.persistence.Id;
 
 public class User {
+	/**
+	 * 标识主键
+	 * 定义ID的生成规则，每次保存后返回ID
+	 */
 	@Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     private Long id;

From d3049ebc6b3fdae7525765a265a5cd24c14600f4 Mon Sep 17 00:00:00 2001
From: wuhoujian <wuhoujian@126.com>
Date: Tue, 16 Apr 2019 17:36:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star/pom.xml                                                  | 4 ++--
 star/star-web/src/main/java/com/gui/star/web/Application.java | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/star/pom.xml b/star/pom.xml
index 12a27dd..c0ee224 100644
--- a/star/pom.xml
+++ b/star/pom.xml
@@ -20,14 +20,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.4.RELEASE</version>
+		<version>2.1.3.RELEASE</version>
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<shiro.version>1.4.0</shiro.version>
-		<springboot.version>2.0.4.RELEASE</springboot.version>
+		<springboot.version>2.1.3.RELEASE</springboot.version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/star/star-web/src/main/java/com/gui/star/web/Application.java b/star/star-web/src/main/java/com/gui/star/web/Application.java
index aaef832..7c1a4f2 100644
--- a/star/star-web/src/main/java/com/gui/star/web/Application.java
+++ b/star/star-web/src/main/java/com/gui/star/web/Application.java
@@ -1,11 +1,9 @@
 package com.gui.star.web;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
-
 import tk.mybatis.spring.annotation.MapperScan;
 
 /**
@@ -19,7 +17,6 @@
 @SpringBootApplication
 @ComponentScan(basePackages = "com.gui")
 @MapperScan(basePackages = "com.gui.star.dal.mapper")
-@EnableAutoConfiguration
 @EnableScheduling
 public class Application {
 	public static void main(String[] args) {