合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

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

@@ -79,7 +79,7 @@
        <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">
@@ -133,4 +133,4 @@
        countDom.val(countDom.val() - 1);
    }
</script>
</html>
</html>