Merge remote-tracking branch 'origin/master'

sgj

6 天以前 824d4e6be22a1d101897bf1be575bb5e3ed33845

 fzzy-igdss-web/src/main/resources/templates/main.html

@@ -1694,7 +1694,7 @@
    </div>
    <script th:src="@{/js/jquery.min.js}"></script>
    <script th:src="@{/js/bootstrap.min.js}"></script>
    <script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
    <script th:src="@{/ajax/libs/layer-ruoyi/layer.min.js}"></script>
    <script type="text/javascript">
       $('#pay-qrcode').click(function(){
           var html=$(this).html();