mirror of
https://gitee.com/best_handsome/mybatis-plus-join
synced 2025-07-11 00:02:22 +08:00
Merge branch 'refs/heads/master1'
This commit is contained in:
commit
08d3b1cf9b
@ -9,8 +9,6 @@ import com.github.yulichang.adapter.v3431.Adapter3431;
|
|||||||
import com.github.yulichang.adapter.v355.Adapter355;
|
import com.github.yulichang.adapter.v355.Adapter355;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author yulichang
|
* @author yulichang
|
||||||
* @since 1.4.3
|
* @since 1.4.3
|
||||||
@ -22,9 +20,7 @@ public class AdapterHelper {
|
|||||||
|
|
||||||
|
|
||||||
static {
|
static {
|
||||||
String lastAdapter = "3.5.9";
|
String version = VersionUtils.getVersion();
|
||||||
String version = Optional.ofNullable(VersionUtils.getVersion()).orElse(lastAdapter);
|
|
||||||
|
|
||||||
if (VersionUtils.compare(version, "3.5.6") >= 0) {
|
if (VersionUtils.compare(version, "3.5.6") >= 0) {
|
||||||
adapter = new Adapter();
|
adapter = new Adapter();
|
||||||
} else if (VersionUtils.compare(version, "3.5.4") >= 0) {
|
} else if (VersionUtils.compare(version, "3.5.4") >= 0) {
|
||||||
|
@ -44,12 +44,14 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.baomidou</groupId>
|
<groupId>com.baomidou</groupId>
|
||||||
<artifactId>mybatis-plus-solon-plugin</artifactId>
|
<artifactId>mybatis-plus-solon-plugin</artifactId>
|
||||||
<version>${mybatis.plus.version}</version>
|
<version>[3.5.9,)</version>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.baomidou</groupId>
|
<groupId>com.baomidou</groupId>
|
||||||
<artifactId>mybatis-plus-jsqlparser</artifactId>
|
<artifactId>mybatis-plus-jsqlparser</artifactId>
|
||||||
<version>${mybatis.plus.version}</version>
|
<version>${mybatis.plus.version}</version>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
2
pom.xml
2
pom.xml
@ -45,7 +45,7 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<revision>1.5.3</revision>
|
<revision>1.5.3</revision>
|
||||||
<mybatis.plus.version>3.5.9</mybatis.plus.version>
|
<mybatis.plus.version>3.5.10.1</mybatis.plus.version>
|
||||||
|
|
||||||
<jdkVersion>17</jdkVersion>
|
<jdkVersion>17</jdkVersion>
|
||||||
<jdkVersion.test>17</jdkVersion.test>
|
<jdkVersion.test>17</jdkVersion.test>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user