Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

lty

9 天以前 d66bc1821a36fd9272292bfa9d9c0980359e9ae0

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

@@ -79,7 +79,7 @@
</ul>

<!-- 主体内容 -->
<iframe id="content" src="stockIn.html"></iframe>
<iframe id="content" src="comb.html"></iframe>

</body>
<script>