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

1

6 天以前 0dd6d42a545d1cf7c47ea1bd232e4857565c108a

 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>