合并代码，解决冲突

zhangchao

2024-11-02 c51ab886ca899243f36cffe6c1a86d19057d44f5

 src/main/webapp/views/adjDetl/adjDetl.html

@@ -21,7 +21,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="mat_no" placeholder="物料编号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="商品" autocomplete="off">
        </div>
    </div>
    <!-- 日期范围 -->