Merge branch 'master' into feature-management-2021-9-16

pom.xml

@@ -40,8 +40,8 @@
         <!--db-->
         <mysql.version>8.0.20</mysql.version>
         <druid-spring-boot-starter.version>1.1.22</druid-spring-boot-starter.version>
-        <mybatis-plus-boot-starter.version>3.3.0</mybatis-plus-boot-starter.version>
-        <mybatis-plus-generator.version>3.3.2</mybatis-plus-generator.version>
+        <mybatis-plus-boot-starter.version>3.4.0</mybatis-plus-boot-starter.version>
+        <mybatis-plus-generator.version>3.4.2</mybatis-plus-generator.version>
         <dynamic-datasource-spring-boot-starter.version>3.3.1</dynamic-datasource-spring-boot-starter.version>
 
         <!--lombok-->