From 8dcfae4fff98fbbb19ff46bd9750f25bc56801a9 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期一, 31 七月 2023 10:42:20 +0800
Subject: [PATCH] Merge branch 'release/v1.1.5发布'

---
 application/admin/model/Banner.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/admin/model/Banner.php b/application/admin/model/Banner.php
index 4c33114..abdae87 100644
--- a/application/admin/model/Banner.php
+++ b/application/admin/model/Banner.php
@@ -44,7 +44,7 @@
     
     public function getTypeList()
     {
-        return ['0' => __('Type 0'), '1' => __('Type 1'), '2' => __('Type 2'), '3' => __('Type 3'), '4' => __('Type 4'), '5' => __('Type 5'), '6' => __('Type 6'), '7' => __('Type 7'),'9' => '鏂颁汉鏁欑▼','10'=>'閫涢��','11'=>'app棣栭〉灏忚疆鎾�','12'=>'棣栭〉杩炴爣','13'=>'app棣栭〉蹇嵎涓�','14'=>'app棣栭〉蹇嵎涓�'];
+        return ['0' => __('Type 0'), '1' => __('Type 1'), '2' => __('Type 2'), '3' => __('Type 3'), '4' => __('Type 4'), '5' => __('Type 5'), '6' => __('Type 6'), '7' => __('Type 7'),'9' => '鏂颁汉鏁欑▼','10'=>'閫涢��','11'=>'app棣栭〉灏忚疆鎾�','12'=>'棣栭〉杩炴爣','13'=>'app棣栭〉蹇嵎涓�','14'=>'app棣栭〉蹇嵎涓�','15'=>'app鍚姩椤�','16'=>'娣樺疂杩斿埄杞挱','17'=>'浜笢杩斿埄杞挱','18'=>'鎶栭煶杩斿埄杞挱','19'=>'鎷煎澶氳繑鍒╄疆鎾�','20'=>'鍞搧浼氳繑鍒╄疆鎾�','21'=>'鑷畾涔夐椤靛脊绐�'];
     }
 
     public function getStatusList()
@@ -54,7 +54,7 @@
 
     public function getUrlTypeList()
     {
-        return ['0' => __('Url_type 0'), '1' => __('Url_type 1'), '2' => __('Url_type 2'), '3' => __('Url_type 3'), '7' => __('Url_type 7'), '11' => __('Url_type 11'), '12' => __('Url_type 12'), '13' => __('Url_type 13'),'14' => __('Url_type 14'),'999' => '涓嶈烦杞�'];
+        return ['0' => __('Url_type 0'), '1' => __('Url_type 1'), '2' => __('Url_type 2'), '3' => __('Url_type 3'), '7' => __('Url_type 7'), '11' => __('Url_type 11'), '12' => __('Url_type 12'), '13' => __('Url_type 13'),'14' => __('Url_type 14'),'15' => __('Url_type 15'),'999' => '涓嶈烦杞�'];
     }
 
     public function getParameterJsonAttr($value, $data)

--
Gitblit v1.9.3