Merge remote-tracking branch 'origin/main'

# Conflicts: # src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java # src/main/resources/views/platform/jf/reimbursement/mine.html # src/main/resources/views/platform/jf/reimbursement/unionChairman.html # src/main/resources/views/platform/shopping/shoppingTypeApply.html
2025-02-28 17:06:55 +08:00
parent f539184fca daa4a24db5
commit a860f9699b
24 changed files with 35 additions and 26 deletions
@@ -77,10 +77,10 @@
        <script src="${base!}/assets/platform/js/v.js?v=1.0.5"></script>
        <script src="${base!}/assets/platform/plugins/wangeditor/wangEditor.js"></script>
        <!--    <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/wangeditor@4.6.15/dist/wangEditor.min.js"></script>-->
-        <script
+       <!-- <script
            type="text/javascript"
            src="https://webapi.amap.com/maps?v=1.4.15&key=6ab3452804ba35050880b5e047436853&plugin=AMap.PolyEditor,AMap.PlaceSearch"
-        ></script>
+        ></script>-->

        <!--viewer-->
        <script src="${base!}/assets/platform/plugins/viewer/viewer.min.js"></script>