From ba94aa39ae925d9021b0ca13ca0b11dd6843656b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 30 十二月 2023 14:22:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java | 2 +-
zy-asrs-common/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-common/pom.xml b/zy-asrs-common/pom.xml
index 0f76561..90c72ac 100644
--- a/zy-asrs-common/pom.xml
+++ b/zy-asrs-common/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
- <version>3.3.2</version>
+ <version>2.2.6</version>
</dependency>
</dependencies>
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
index 67fae2e..dba6aa1 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
@@ -24,7 +24,7 @@
generator.url="47.97.1.152:51433;databasename=jkasrs";
generator.username="sa";
generator.password="Zoneyung@zy56$";
- generator.table="wcs_motion_sts";
+ generator.table="wcs_crn";
generator.packagePath="com.zy.asrs.common.wcs";
generator.build();
}
--
Gitblit v1.9.1