合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

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

@@ -83,7 +83,7 @@
        <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">