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

zjj

15 小时以前 ebce471ec71ea6acdef92b4316d12e62ae223512

 src/main/webapp/views/basWhs/basWhs.html

@@ -31,7 +31,7 @@

<!-- 表格 -->
<div class="layui-form">
    <table class="layui-hide" id="basWhs" lay-filter="basWhs"></table>
    <table class="layui-hide" id="basWhsType" lay-filter="basWhsType"></table>
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
@@ -49,7 +49,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basWhs/basWhs.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basWhsType/basWhsType.js" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>