From f3b561f8e989dee445583cca7f6c71b43cf85160 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Fri, 8 Nov 2024 10:37:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/controller/PqDevController.java    |  0
 .../device/mapper/PqDevMapper.java            |  0
 .../device/mapper/mapping/PqDevMapper.xml     |  0
 .../device/pojo/param/PqDevParam.java         |  0
 .../device/pojo/po/PqDev.java                 |  0
 .../device/pojo/vo/PqDevExcel.java            |  0
 .../device/service/IPqDevService.java         |  0
 .../device/service/impl/PqDevServiceImpl.java |  0
 .../device/util/DeviceUtil.java               |  0
 .../pojo/constant/MachineValidMessage.java    |  0
 .../pojo/enums/MachineResponseEnum.java       |  0
 user/pom.xml                                  | 25 +++++++++++++++----
 12 files changed, 20 insertions(+), 5 deletions(-)
 rename device/src/main/java/com/njcn/gather/{machine => dev}/device/controller/PqDevController.java (100%)
 rename device/src/main/java/com/njcn/gather/{machine => dev}/device/mapper/PqDevMapper.java (100%)
 rename device/src/main/java/com/njcn/gather/{machine => dev}/device/mapper/mapping/PqDevMapper.xml (100%)
 rename device/src/main/java/com/njcn/gather/{machine => dev}/device/pojo/param/PqDevParam.java (100%)
 rename device/src/main/java/com/njcn/gather/{machine => dev}/device/pojo/po/PqDev.java (100%)
 rename device/src/main/java/com/njcn/gather/{machine => dev}/device/pojo/vo/PqDevExcel.java (100%)
 rename device/src/main/java/com/njcn/gather/{machine => dev}/device/service/IPqDevService.java (100%)
 rename device/src/main/java/com/njcn/gather/{machine => dev}/device/service/impl/PqDevServiceImpl.java (100%)
 rename device/src/main/java/com/njcn/gather/{machine => dev}/device/util/DeviceUtil.java (100%)
 rename device/src/main/java/com/njcn/gather/{machine => dev}/pojo/constant/MachineValidMessage.java (100%)
 rename device/src/main/java/com/njcn/gather/{machine => dev}/pojo/enums/MachineResponseEnum.java (100%)

diff --git a/device/src/main/java/com/njcn/gather/machine/device/controller/PqDevController.java b/device/src/main/java/com/njcn/gather/dev/device/controller/PqDevController.java
similarity index 100%
rename from device/src/main/java/com/njcn/gather/machine/device/controller/PqDevController.java
rename to device/src/main/java/com/njcn/gather/dev/device/controller/PqDevController.java
diff --git a/device/src/main/java/com/njcn/gather/machine/device/mapper/PqDevMapper.java b/device/src/main/java/com/njcn/gather/dev/device/mapper/PqDevMapper.java
similarity index 100%
rename from device/src/main/java/com/njcn/gather/machine/device/mapper/PqDevMapper.java
rename to device/src/main/java/com/njcn/gather/dev/device/mapper/PqDevMapper.java
diff --git a/device/src/main/java/com/njcn/gather/machine/device/mapper/mapping/PqDevMapper.xml b/device/src/main/java/com/njcn/gather/dev/device/mapper/mapping/PqDevMapper.xml
similarity index 100%
rename from device/src/main/java/com/njcn/gather/machine/device/mapper/mapping/PqDevMapper.xml
rename to device/src/main/java/com/njcn/gather/dev/device/mapper/mapping/PqDevMapper.xml
diff --git a/device/src/main/java/com/njcn/gather/machine/device/pojo/param/PqDevParam.java b/device/src/main/java/com/njcn/gather/dev/device/pojo/param/PqDevParam.java
similarity index 100%
rename from device/src/main/java/com/njcn/gather/machine/device/pojo/param/PqDevParam.java
rename to device/src/main/java/com/njcn/gather/dev/device/pojo/param/PqDevParam.java
diff --git a/device/src/main/java/com/njcn/gather/machine/device/pojo/po/PqDev.java b/device/src/main/java/com/njcn/gather/dev/device/pojo/po/PqDev.java
similarity index 100%
rename from device/src/main/java/com/njcn/gather/machine/device/pojo/po/PqDev.java
rename to device/src/main/java/com/njcn/gather/dev/device/pojo/po/PqDev.java
diff --git a/device/src/main/java/com/njcn/gather/machine/device/pojo/vo/PqDevExcel.java b/device/src/main/java/com/njcn/gather/dev/device/pojo/vo/PqDevExcel.java
similarity index 100%
rename from device/src/main/java/com/njcn/gather/machine/device/pojo/vo/PqDevExcel.java
rename to device/src/main/java/com/njcn/gather/dev/device/pojo/vo/PqDevExcel.java
diff --git a/device/src/main/java/com/njcn/gather/machine/device/service/IPqDevService.java b/device/src/main/java/com/njcn/gather/dev/device/service/IPqDevService.java
similarity index 100%
rename from device/src/main/java/com/njcn/gather/machine/device/service/IPqDevService.java
rename to device/src/main/java/com/njcn/gather/dev/device/service/IPqDevService.java
diff --git a/device/src/main/java/com/njcn/gather/machine/device/service/impl/PqDevServiceImpl.java b/device/src/main/java/com/njcn/gather/dev/device/service/impl/PqDevServiceImpl.java
similarity index 100%
rename from device/src/main/java/com/njcn/gather/machine/device/service/impl/PqDevServiceImpl.java
rename to device/src/main/java/com/njcn/gather/dev/device/service/impl/PqDevServiceImpl.java
diff --git a/device/src/main/java/com/njcn/gather/machine/device/util/DeviceUtil.java b/device/src/main/java/com/njcn/gather/dev/device/util/DeviceUtil.java
similarity index 100%
rename from device/src/main/java/com/njcn/gather/machine/device/util/DeviceUtil.java
rename to device/src/main/java/com/njcn/gather/dev/device/util/DeviceUtil.java
diff --git a/device/src/main/java/com/njcn/gather/machine/pojo/constant/MachineValidMessage.java b/device/src/main/java/com/njcn/gather/dev/pojo/constant/MachineValidMessage.java
similarity index 100%
rename from device/src/main/java/com/njcn/gather/machine/pojo/constant/MachineValidMessage.java
rename to device/src/main/java/com/njcn/gather/dev/pojo/constant/MachineValidMessage.java
diff --git a/device/src/main/java/com/njcn/gather/machine/pojo/enums/MachineResponseEnum.java b/device/src/main/java/com/njcn/gather/dev/pojo/enums/MachineResponseEnum.java
similarity index 100%
rename from device/src/main/java/com/njcn/gather/machine/pojo/enums/MachineResponseEnum.java
rename to device/src/main/java/com/njcn/gather/dev/pojo/enums/MachineResponseEnum.java
diff --git a/user/pom.xml b/user/pom.xml
index 714edf46..04f99076 100644
--- a/user/pom.xml
+++ b/user/pom.xml
@@ -12,10 +12,25 @@
     <groupId>com.njcn.gather</groupId>
     <artifactId>user</artifactId>
 
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>njcn-common</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>mybatis-plus</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>spingboot2.3.12</artifactId>
+            <version>2.3.12</version>
+        </dependency>
+
+    </dependencies>
 
 </project>
\ No newline at end of file