Browse Source

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-boot

xuzuoyun 4 years ago
parent
commit
b93afd5747

File diff suppressed because it is too large
+ 814 - 784
jeecg-boot-base-common/src/main/java/org/jeecg/common/system/query/QueryGenerator.java


+ 1 - 1
pom.xml

@@ -91,7 +91,7 @@
         <java.version>1.8</java.version>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <mybatis-plus.version>3.1.2</mybatis-plus.version>
+        <mybatis-plus.version>3.3.2</mybatis-plus.version>
         <druid.version>1.1.10</druid.version>
         <commons.version>2.6</commons.version>
         <aliyun-java-sdk-core.version>3.5.0</aliyun-java-sdk-core.version>