修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferMapper.xml

@@ -168,12 +168,14 @@
       SELECT DISTINCT
         b.company_name companyName,
         c.resources_name carName,
-        c.resources_num carNum
+        c.resources_num carNum,
+        u.amos_user_name `user`
 
     FROM
         jc_power_transfer a
         LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
         LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
+        LEFT JOIN jc_user_car u ON c.resources_id =  u.car_id
     WHERE
         a.alert_called_id = ${id}
     </select>

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/pom.xml

@@ -43,8 +43,8 @@
       </dependency>
       <dependency>
           <groupId>e-iceblue</groupId>
-          <artifactId>spire.doc</artifactId>
-          <version>4.9.0</version>
+          <artifactId>spire.doc.free</artifactId>
+          <version>3.9.0</version>
       </dependency>
       <dependency>
           <groupId>com.amosframework.boot</groupId>

pom.xml

@@ -270,6 +270,11 @@
 				<version>4.4.3</version>
 			</dependency>
 			<dependency>
+				<groupId>e-iceblue</groupId>
+				<artifactId>spire.doc.free</artifactId>
+				<version>3.9.0</version>
+			</dependency>
+			<dependency>
 				<groupId>net.sf.json-lib</groupId>
 				<artifactId>json-lib</artifactId>
 				<version>2.4</version>
@@ -287,16 +292,17 @@
 			<name>Snapshots</name>
 			<url>http://4v059425e3.zicp.vip:13535/nexus/content/repositories/snapshots/</url>
 		</repository>
-		<repository>
-			<id>com.e-iceblue</id>
-			<name>e-iceblue</name>
-			<url>https://repo.e-iceblue.com/nexus/content/groups/public/</url>
-		</repository>-->
+		-->
 		<repository>
 			<id>Releases</id>
 			<name>Releases</name>
 			<url>http://36.46.149.14:8081/nexus/content/repositories/releases/</url>
 		</repository>
+		<repository>
+			<id>com.e-iceblue</id>
+			<name>e-iceblue</name>
+			<url>https://repo.e-iceblue.com/nexus/content/groups/public/</url>
+		</repository>
 
 		<repository>
 			<id>Snapshots</id>