From 334fbd5f1a5a4e85c198560bd024211ba4cf99b1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 18:27:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js b/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js
index dd36d09..d042a33 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js
@@ -24,7 +24,7 @@
         {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
         {title: '广告类型', field: 'position', visible: true, align: 'center', valign: 'middle',width:'20%',
             formatter:function (data) {
-                return {1:"首页banner",2:"线上课得积分",3:"看视频得奖励",4:"常见问题"}[data]
+                return {1:"首页banner",2:"线上课得积分",3:"看视频得奖励",4:"常见问题",6:"社区世界杯顶部",7:"社区世界杯底部"}[data]
             }
         },
         {title: '广告名称', field: 'name', visible: true, align: 'center', valign: 'middle'},

--
Gitblit v1.7.1