合并代码，解决冲突

zhangchao

2024-11-02 f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae

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

@@ -37,7 +37,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="supp_code" placeholder="料箱码" autocomplete="off">
            <input class="layui-input" type="text" name="supp_code" placeholder="货架码" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">