Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/zhgh_njnu

# Conflicts:
#	src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js
#	src/main/resources/views/platform/zhgh/activity/sports/applyUser/index.html

src/main/resources/static/components/plugins/Guava.vue

@@ -18,6 +18,9 @@
             <div :class="{ card_scroll: edit_scroll }">
                 <slot name="edit"></slot>
             </div>
+            <div style="border-top: 1px solid #ebeef5; padding-top: 10px">
+                <slot name="edit-footer"></slot>
+            </div>
         </el-card>
 
         <el-card v-if="v === 'view'" key="view" shadow="never" class="animated-card">
@@ -156,7 +159,7 @@ module.exports = {
 }
 
 .card_scroll {
-    max-height: calc(100vh - 56px - 40px - 30px - 50px - 34px);
+    max-height: calc(100vh - 56px - 40px - 30px - 50px - 34px - 50px - 10px);
     overflow-y: auto;
     position: relative;
 }