diff --git a/pom.xml b/pom.xml index 4b347ed0..6f2016c6 100644 --- a/pom.xml +++ b/pom.xml @@ -902,25 +902,7 @@ system ${project.basedir}/src/main/webapp/WEB-INF/lib/sapjco3.jar - - - - - - - - org.apache.httpcomponents - httpclient - 4.3.2 - jar - compile - - - org.apache.httpcomponents - httpcore - 4.3.1 - - + @@ -940,7 +922,25 @@ ${project.basedir}/src/main/webapp/WEB-INF/lib/jodconverter-3.0-beta-4-20170917.jar - + + + + + + + + org.apache.httpcomponents + httpclient + 4.3.2 + jar + compile + + + org.apache.httpcomponents + httpcore + 4.3.1 + + io.springfox 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() { 体积 规格 拣货 - 托盘/保质期 二维码