From 7c2abe11fb48e6df840fd0ec6386ac8ae8855eb0 Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Wed, 25 Sep 2019 22:44:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=9E=B6=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 40 +++++++++----------
 .../com/zzjee/wm/print/jianhuorenwu-print.jsp |  1 -
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4b347ed0..6f2016c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -902,25 +902,7 @@
 			<scope>system</scope>
 			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/sapjco3.jar</systemPath>
 		</dependency>
-		<!--<dependency>-->
-			<!--<groupId>org.jeewx</groupId>-->
-			<!--<artifactId>jeewx-api</artifactId>-->
-			<!--<version>1.2.0</version>-->
-		<!--</dependency>-->
-		<!--yoongyou begin-->
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.3.2</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
-			<version>4.3.1</version>
-		</dependency>
-		<!--用友end-->
+
 
 
 		<!-- codegenerate -->
@@ -940,7 +922,25 @@
 			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/jodconverter-3.0-beta-4-20170917.jar</systemPath>
 		</dependency>
 
-
+		<!--<dependency>-->
+		<!--<groupId>org.jeewx</groupId>-->
+		<!--<artifactId>jeewx-api</artifactId>-->
+		<!--<version>1.2.0</version>-->
+		<!--</dependency>-->
+		<!--yoongyou begin-->
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.3.2</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>4.3.1</version>
+		</dependency>
+		<!--用友end-->
 		<!-- swagger  start -->
 		<dependency>
 			<groupId>io.springfox</groupId>
diff --git a/src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwu-print.jsp b/src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwu-print.jsp
index 4767dcc1..8e4f9721 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwu-print.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwu-print.jsp
@@ -216,7 +216,6 @@ function downloadqrcode() {
 			<td class=xl65 style='border:1.0pt solid black;text-align: center'>体积</td>
 			<td class=xl65 style='border:1.0pt solid black;text-align: center'>规格</td>
 			<td class=xl65 style='border:1.0pt solid black;text-align: center'>拣货</td>
-
 			<td class=xl65 style='border:1.0pt solid black;text-align: center'>托盘/保质期</td>
 			<td class=xl65 style='border:1.0pt solid black;text-align: center'>二维码</td>