Merge remote-tracking branch 'origin/integrationWms' into integrationWms

zhang

1 天以前 d2398eb18ecfbfc9ecafe597a22b00615e61db46

Merge remote-tracking branch 'origin/integrationWms' into integrationWms

 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:

 src/main/resources/wms.bak

Binary files differ

 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">