Merge branch 'leng_dev' into k8s

This commit is contained in:
冷冷 committed 2018-08-16 10:03:40 +08:00
commit 8e1ccd76d9
25 files changed
+335 -177

No files matched your search

+2 -1
View File
@@ -44,7 +44,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<monitor.version>2.0.1</monitor.version>
<hutool.version>4.1.4</hutool.version>
<hutool.version>4.1.7</hutool.version>
<mbp.boot.version>2.3</mbp.boot.version>
<kaptcha.version>0.0.9</kaptcha.version>
<swagger.version>2.9.2</swagger.version>
@@ -89,6 +89,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<!--测试依赖-->
<dependency>