From d41358fce9a436d81b9341d06fc1d8f3ddff92ff Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement.html |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement.html
index 0ed8fb3..5702f2c 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement.html
@@ -15,7 +15,9 @@
                             <div class="col-sm-3">
                                 <#SelectCon id="page" name="跳转页面" >
                                 <option value="">请选择</option>
-
+                                @for(obj in pages){
+                                <option value="${obj.id}">${obj.name}</option>
+                                @}
                             </#SelectCon>
                         </div>
                         <div class="col-sm-3">

--
Gitblit v1.7.1