From 6db1c7d6ddc4e5781557f0c44b48716f5b32a12d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 24 五月 2024 12:01:39 +0800
Subject: [PATCH] 卧式理片笼线程改造:新增状态码2非自动状态禁用
---
hangzhoumesParent/common/pom.xml | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/common/pom.xml b/hangzhoumesParent/common/pom.xml
index e75f8e1..951b4ea 100644
--- a/hangzhoumesParent/common/pom.xml
+++ b/hangzhoumesParent/common/pom.xml
@@ -6,6 +6,7 @@
<artifactId>hangzhoumesParent</artifactId>
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -43,13 +44,19 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.2.0</version>
+ <version>3.3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.yulichang</groupId>
+ <artifactId>mybatis-plus-join-boot-starter</artifactId>
+ <version>1.4.8</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- <version>3.2.0</version>
+ <version>3.3.1</version>
</dependency>
<dependency>
@@ -160,9 +167,22 @@
<version>1.4.2</version>
</dependency>
+ <!--寮曞叆redis,鎺掗櫎lettuce鐨勫紩鐢�-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>io.lettuce</groupId>
+ <artifactId>lettuce-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- 寮曞叆Jedis瀹㈡埗绔�-->
+ <dependency>
+ <groupId>redis.clients</groupId>
+ <artifactId>jedis</artifactId>
</dependency>
<dependency>
@@ -171,12 +191,16 @@
<version>1.2.33</version>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.github.yulichang</groupId>-->
+<!-- <artifactId>mybatis-plus-join</artifactId>-->
+<!-- <version>1.2.4</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>com.github.yulichang</groupId>
- <artifactId>mybatis-plus-join</artifactId>
- <version>1.2.4</version>
+ <artifactId>mybatis-plus-join-boot-starter</artifactId>
+ <version>1.4.12</version>
</dependency>
-
</dependencies>
--
Gitblit v1.8.0