From 535b47bc9e9ded8045438d13b5fdaf366c82af98 Mon Sep 17 00:00:00 2001
From: maxf <1107047387@qq.com>
Date: Tue, 20 Nov 2018 20:27:02 +0800
Subject: [PATCH] =?UTF-8?q?1.1.5=20=E4=BF=AE=E5=A4=8Dsecurity=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UPDATE.md                       | 12 ++++++++++++
 pom.xml                         |  2 +-
 yexuejc-springboot-base/pom.xml |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/UPDATE.md b/UPDATE.md
index a207ab2..913a5e7 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -1,6 +1,18 @@
 yexuejc-springboot 更新内容
 -------------------
 
+#### version ：1.1.5
+**time：2018年11月20日20:26:06** <br/>
+**branch：** master    <br/>
+**关联工程：**    <br/>
+```
+springboot-base:1.2.1
+spring-boot-starter-parent:1.5.16.RELEASE
+```
+**update：**     <br/>
+1. 修复security登录
+#
+
 #### version ：1.1.4
 **time：2018-11-9 16:55:53** <br/>
 **branch：** master    <br/>
diff --git a/pom.xml b/pom.xml
index a3545ea..bc5ae99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.yexuejc.springboot</groupId>
     <artifactId>yexuejc-springboot-parent</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
diff --git a/yexuejc-springboot-base/pom.xml b/yexuejc-springboot-base/pom.xml
index 80a3e95..972a216 100644
--- a/yexuejc-springboot-base/pom.xml
+++ b/yexuejc-springboot-base/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.yexuejc.springboot</groupId>
         <artifactId>yexuejc-springboot-parent</artifactId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
         <!-- 本地打包：使用相对关联路径 -->
         <!--<relativePath>../../yexuejc</relativePath>-->
     </parent>