From d2398eb18ecfbfc9ecafe597a22b00615e61db46 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 04 十一月 2025 14:20:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/integrationWms' into integrationWms
---
src/main/resources/wms.bak | 0
src/main/resources/application-dev.yml | 2 +-
src/main/webapp/views/basWhs/basWhs.html | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index cbdf8e9..d321721 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -12,7 +12,7 @@
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
username: sa
password: sa@123
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=wms2.0
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=wms
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/resources/wms.bak b/src/main/resources/wms.bak
new file mode 100644
index 0000000..e3f7e5a
--- /dev/null
+++ b/src/main/resources/wms.bak
Binary files differ
diff --git a/src/main/webapp/views/basWhs/basWhs.html b/src/main/webapp/views/basWhs/basWhs.html
index 7cfbfc9..03680d9 100644
--- a/src/main/webapp/views/basWhs/basWhs.html
+++ b/src/main/webapp/views/basWhs/basWhs.html
@@ -31,7 +31,7 @@
<!-- 琛ㄦ牸 -->
<div class="layui-form">
- <table class="layui-hide" id="basWhsType" lay-filter="basWhsType"></table>
+ <table class="layui-hide" id="basWhs" lay-filter="basWhs"></table>
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
--
Gitblit v1.9.1