From 9c20f268e0628017d09427989724cdf2a8e9e8e2 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 12:47:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/pom.xml |   56 ++++++--------------------------------------------------
 1 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/server/pom.xml b/server/pom.xml
index 57b0d85..be687ef 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -9,13 +9,13 @@
   <packaging>pom</packaging>
   <name>preselect</name>
   <description></description>
-    <modules>
-      <module>platform</module>
-      <module>service</module>
-      <module>company</module>
-    </modules>
+  <modules>
+    <module>platform</module>
+    <module>service</module>
+    <module>company</module>
+  </modules>
 
-    <parent>
+  <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
     <version>2.2.5.RELEASE</version>
@@ -34,7 +34,6 @@
     <oshi.version>5.7.0</oshi.version>
     <jna.version>5.7.0</jna.version>
     <poi.version>5.0.0</poi.version>
-    <maven.build.timestamp.format>yyyy-MM-dd-HH-mm</maven.build.timestamp.format>
   </properties>
 
   <dependencies>
@@ -202,26 +201,7 @@
       <artifactId>jxl</artifactId>
       <version>2.6.12</version>
     </dependency>
-
   </dependencies>
-
-  <profiles>
-    <profile>
-      <id>dev</id>
-      <properties>
-        <evn>dev</evn>
-      </properties>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-    </profile>
-    <profile>
-      <id>test</id>
-      <properties>
-        <evn>test</evn>
-      </properties>
-    </profile>
-  </profiles>
   <build>
     <plugins>
       <plugin>
@@ -234,28 +214,4 @@
       </plugin>
     </plugins>
   </build>
-
-
-
-  <!--<build>
-
-    <finalName>${project.artifactId}</finalName>
-
-    <resources>
-      <resource>
-        <directory>service/src/main/resources</directory>
-&lt;!&ndash;        <filtering>true</filtering>&ndash;&gt;
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <configuration>
-          <mainClass>com.doumee.Application</mainClass>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>-->
-
 </project>

--
Gitblit v1.9.3