From e2be094c27970cadd0df4540fc029df015a6a435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?=
 <852955+jishenghua@users.noreply.gitee.com>
Date: Wed, 22 May 2019 23:41:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7jxl=E5=8C=85=E7=9A=84?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 600e75db..38719f50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
 		<dependency>
 			<groupId>net.sourceforge.jexcelapi</groupId>
 			<artifactId>jxl</artifactId>
-			<version>2.6.3</version>
+			<version>2.6.12</version>
 		</dependency>
 		<!-- lombok -->
 		<dependency>

From 2480aa3e78e043ea80ee0dd8d931af66f0e3434e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?=
 <852955+jishenghua@users.noreply.gitee.com>
Date: Wed, 22 May 2019 23:42:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0sql=EF=BC=8C=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E5=87=BD=E6=95=B0=E5=88=9B=E5=BB=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/jsh_erp(第一次建库请使用这个).sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/jsh_erp(第一次建库请使用这个).sql b/sql/jsh_erp(第一次建库请使用这个).sql
index f0d47704..6264d8e9 100644
--- a/sql/jsh_erp(第一次建库请使用这个).sql
+++ b/sql/jsh_erp(第一次建库请使用这个).sql
@@ -1991,7 +1991,7 @@ INSERT INTO `tbl_sequence` VALUES ('depot_number_seq', '1', '999999999999999999'
 -- ----------------------------
 DROP FUNCTION IF EXISTS `_nextval`;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `_nextval`(name varchar(50)) RETURNS mediumtext CHARSET utf8
+CREATE FUNCTION `_nextval`(name varchar(50)) RETURNS mediumtext CHARSET utf8
 begin
 declare _cur bigint;
 declare _maxvalue bigint;  -- 接收最大值