|
@@ -33,11 +33,10 @@
|
|
<java.version>1.8</java.version>
|
|
<java.version>1.8</java.version>
|
|
<spring-cloud.version>Hoxton.SR5</spring-cloud.version>
|
|
<spring-cloud.version>Hoxton.SR5</spring-cloud.version>
|
|
<spring-boot-admin-starter-server.version>2.2.3</spring-boot-admin-starter-server.version>
|
|
<spring-boot-admin-starter-server.version>2.2.3</spring-boot-admin-starter-server.version>
|
|
- <mybatis-plus-boot-starter.version>3.2.0</mybatis-plus-boot-starter.version>
|
|
|
|
|
|
+ <mybatis-plus.version>3.2.0</mybatis-plus.version>
|
|
<mysql-connector-java.version>8.0.18</mysql-connector-java.version>
|
|
<mysql-connector-java.version>8.0.18</mysql-connector-java.version>
|
|
<ojdbc6.version>11.2.0.3</ojdbc6.version>
|
|
<ojdbc6.version>11.2.0.3</ojdbc6.version>
|
|
<druid-spring-boot-starter.version>1.1.16</druid-spring-boot-starter.version>
|
|
<druid-spring-boot-starter.version>1.1.16</druid-spring-boot-starter.version>
|
|
- <mybatis-plus-generator.version>3.2.0</mybatis-plus-generator.version>
|
|
|
|
<velocity-engine-core.version>2.1</velocity-engine-core.version>
|
|
<velocity-engine-core.version>2.1</velocity-engine-core.version>
|
|
<freemarker.version>2.3.29</freemarker.version>
|
|
<freemarker.version>2.3.29</freemarker.version>
|
|
<beetl.version>3.0.13.RELEASE</beetl.version>
|
|
<beetl.version>3.0.13.RELEASE</beetl.version>
|
|
@@ -91,7 +90,7 @@
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>com.baomidou</groupId>
|
|
<groupId>com.baomidou</groupId>
|
|
<artifactId>mybatis-plus-boot-starter</artifactId>
|
|
<artifactId>mybatis-plus-boot-starter</artifactId>
|
|
- <version>${mybatis-plus-boot-starter.version}</version>
|
|
|
|
|
|
+ <version>${mybatis-plus.version}</version>
|
|
</dependency>
|
|
</dependency>
|
|
|
|
|
|
<!-- mysql数据库依赖 依赖 -->
|
|
<!-- mysql数据库依赖 依赖 -->
|
|
@@ -119,7 +118,7 @@
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>com.baomidou</groupId>
|
|
<groupId>com.baomidou</groupId>
|
|
<artifactId>mybatis-plus-generator</artifactId>
|
|
<artifactId>mybatis-plus-generator</artifactId>
|
|
- <version>${mybatis-plus-generator.version}</version>
|
|
|
|
|
|
+ <version>${mybatis-plus.version}</version>
|
|
<scope>test</scope>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
</dependency>
|
|
<dependency>
|
|
<dependency>
|