From 33252365eb0912ce3a856afd38180b6911679643 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 九月 2023 12:18:38 +0800
Subject: [PATCH] sessionkey更换
---
platform/src/views/business/company.vue | 1
server/platform/pom.xml | 5 --
platform/src/views/business/baseData.vue | 2
server/pom.xml | 56 +++-------------------------
4 files changed, 8 insertions(+), 56 deletions(-)
diff --git a/platform/src/views/business/baseData.vue b/platform/src/views/business/baseData.vue
index 2ca1594..c9a4cc1 100644
--- a/platform/src/views/business/baseData.vue
+++ b/platform/src/views/business/baseData.vue
@@ -79,7 +79,7 @@
</div>
</template>
</el-table-column>
-<!-- <el-table-column prop="attr1" label="灞炴��1" min-width="100px"></el-table-column>
+<!-- <el-table-column prop="attr1" label="灞炴��1" min-width="100px"></el-table-column>
<el-table-column prop="attr2" label="灞炴��2" min-width="100px"></el-table-column>
<el-table-column prop="attr3" label="灞炴��3" min-width="100px"></el-table-column>
<el-table-column prop="attr4" label="灞炴��4" min-width="100px"></el-table-column>
diff --git a/platform/src/views/business/company.vue b/platform/src/views/business/company.vue
index fdfe560..8ae8e33 100644
--- a/platform/src/views/business/company.vue
+++ b/platform/src/views/business/company.vue
@@ -35,6 +35,7 @@
<el-table v-loading="isWorking.search" :data="tableData.list" border stripe
@selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center"></el-table-column> -->
+ <el-table-column prop="id" label="浼佷笟缂栧彿" min-width="80px" align="center"></el-table-column>
<el-table-column prop="name" label="浼佷笟鍚嶇О" min-width="100px" align="center"></el-table-column>
<el-table-column prop="managerUserName" label="绠$悊鍛樿处鍙�" min-width="100px" align="center"></el-table-column>
<el-table-column prop="linkname" label="鑱旂郴浜�" min-width="100px" align="center"></el-table-column>
diff --git a/server/platform/pom.xml b/server/platform/pom.xml
index 95cc8db..dec41ea 100644
--- a/server/platform/pom.xml
+++ b/server/platform/pom.xml
@@ -47,11 +47,6 @@
</execution>
</executions>
</plugin>
- <!--<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.6</version>
- </plugin>-->
</plugins>
</build>
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>
-<!– <filtering>true</filtering>–>
- </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