From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/pom.xml |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/hangzhoumesParent/common/pom.xml b/hangzhoumesParent/common/pom.xml
index 49ca831..affa009 100644
--- a/hangzhoumesParent/common/pom.xml
+++ b/hangzhoumesParent/common/pom.xml
@@ -15,6 +15,7 @@
     <modules>
         <module>servicebase</module>
         <module>springsecurity</module>
+        <module>opcuaClient</module>
     </modules>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -189,12 +190,6 @@
             <artifactId>fastjson</artifactId>
             <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-boot-starter</artifactId>

--
Gitblit v1.8.0