合并代码，解决冲突

zhangchao

2024-11-02 f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae

 src/main/webapp/views/pda/locDetlIframe.html

@@ -79,11 +79,11 @@
        <input id="locNo" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span>单据号</span>
        <span>物料号</span>
        <input id="matnr" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span>物料号</span>
        <span>物料名称</span>
        <input id="maktx" type="text" disabled="disabled">
    </div>
    <div class="form-item">