Merge branch 'gdasrs' of https://gitee.com/luxiaotao1123/zy-asrs into gdasrs

luxiaotao1123

2020-09-15 5fe9c379f0cc696568a0db249026a1e8a3b02a5a

 src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html

@@ -42,13 +42,13 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">物料编码：</label>
            <label class="layui-form-label">产品代号：</label>
            <div class="layui-input-inline">
                <input id="matnr" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">物料描述：</label>
            <label class="layui-form-label">产品描述：</label>
            <div class="layui-input-inline">
                <input id="maktx" class="layui-input" type="text">
            </div>