From 3031d1201588ff85fbbffd14684e30cc20c23aca Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 29 六月 2023 09:32:39 +0800
Subject: [PATCH] poi、easyexcel、poi-tl升级 ,合并空调中的报表、数据源模块

---
 pom.xml |   55 +++++++++++++++++++++++++++++++------------------------
 1 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index caf3ec3..4a28cbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,14 +40,22 @@
 
     </profiles>
     <dependencies>
+        <!--閫氱敤妯″潡锛坲til)-->
         <dependency>
             <groupId>com.lx</groupId>
             <artifactId>product-server-common</artifactId>
         </dependency>
+        <!--鏁版嵁婧�-->
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-datasource</artifactId>
+        </dependency>
+        <!--鎵撳嵃锛坵ord鏇挎崲锛�-->
         <dependency>
             <groupId>com.lx</groupId>
             <artifactId>product-server-print</artifactId>
         </dependency>
+        <!--util-->
         <dependency>
             <groupId>com.lx</groupId>
             <artifactId>product-server-util</artifactId>
@@ -73,14 +81,10 @@
             <groupId>com.lx</groupId>
             <artifactId>product-server-mq</artifactId>
         </dependency>
+        <!--闄勪欢绠$悊銆佹枃妗g鐞�-->
         <dependency>
             <groupId>com.lx</groupId>
             <artifactId>product-server-file</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.lx</groupId>
-            <artifactId>product-server-email</artifactId>
         </dependency>
         <dependency>
             <groupId>com.lx</groupId>
@@ -92,51 +96,44 @@
             <artifactId>product-server-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sendgrid</groupId>
-            <artifactId>sendgrid-java</artifactId>
-            <version>4.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>4.1</version>
-        </dependency>
-        <dependency>
             <groupId>com.lx</groupId>
             <artifactId>product-server-report</artifactId>
         </dependency>
+        <!--鏁版嵁瀵煎叆瀵煎嚭-->
         <dependency>
             <groupId>com.lx</groupId>
             <artifactId>product-server-data-export-import</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.lx</groupId>
-            <artifactId>product-server-data-export-import</artifactId>
-        </dependency>
+        <!--寮�鍙戝伐鍏�-->
         <dependency>
             <groupId>com.lx</groupId>
             <artifactId>product-server-tool-dev</artifactId>
         </dependency>
+        <!--娴佺▼寤烘ā-->
         <dependency>
             <groupId>com.lx</groupId>
             <artifactId>product-server-tool-flow</artifactId>
         </dependency>
+        <!--鍔熻兘寤烘ā-->
         <dependency>
             <groupId>com.lx</groupId>
             <artifactId>product-server-tool-mvc</artifactId>
         </dependency>
+        <!-- 琛ㄥ崟寤烘ā-->
         <dependency>
             <groupId>com.lx</groupId>
             <artifactId>product-server-tool-face</artifactId>
+        </dependency>
+        <!--鏁版嵁寤烘ā-->
+        <dependency>
+            <groupId>com.lx</groupId>
+            <artifactId>product-server-tool-table</artifactId>
         </dependency>
         <dependency>
             <groupId>com.lx</groupId>
             <artifactId>product-server-announcement</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.lx</groupId>
-            <artifactId>product-server-tool-table</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>com.lx</groupId>
             <artifactId>product-server-data-sync</artifactId>
@@ -186,6 +183,16 @@
             <artifactId>spring-server-master</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.sendgrid</groupId>
+            <artifactId>sendgrid-java</artifactId>
+            <version>4.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.1</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -305,7 +312,7 @@
                             <!-- <target description="run the bat">
                                 <echo>寮�濮嬭繍琛宲acked.bat鍛戒护琛�</echo>
                                <exec dir="D:/product/lxworkspaces/product-web" executable="cmd.exe">
-                                    <arg line="packed.bat"></arg> 
+                                    <arg line="packed.bat"></arg>
                                 </exec>
                             </target> -->
                         </configuration>

--
Gitblit v1.9.2