From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Wed, 18 Aug 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
pom.xml | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 63e613a..ce7f529 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>1.2</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
@@ -376,20 +376,18 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
- <version>4.0.1</version>
+ <version>4.1.1</version>
</dependency>
-
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
- <version>3.17</version>
+ <version>4.1.1</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.9</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.20</version>
+ </dependency>
</dependencies>
<profiles>
@@ -474,6 +472,30 @@
<profile.active>zkyshs</profile.active>
</properties>
</profile>
+ <profile>
+ <id>gslab</id>
+ <properties>
+ <profile.active>gslab</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>zkdsz</id>
+ <properties>
+ <profile.active>zkdsz</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>xjdx</id>
+ <properties>
+ <profile.active>xjdx</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>aky</id>
+ <properties>
+ <profile.active>aky</profile.active>
+ </properties>
+ </profile>
</profiles>
<build>
<finalName>smartlab</finalName>
--
Gitblit v1.9.2