From 34db7035c9c7880e00b9328d022be65a29c62cb2 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期一, 31 七月 2023 10:40:56 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.5接口' into develop

---
 public/assets/js/backend/banner.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/public/assets/js/backend/banner.js b/public/assets/js/backend/banner.js
index 32ec9ea..dc89045 100644
--- a/public/assets/js/backend/banner.js
+++ b/public/assets/js/backend/banner.js
@@ -28,7 +28,7 @@
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
-                        {field: 'type', title: __('Type'), searchList: {"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":'閫涢��'}, formatter: Table.api.formatter.normal},
+                        {field: 'type', title: __('Type'), searchList: {"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":"鑷畾涔夐椤靛脊绐�"}, formatter: Table.api.formatter.normal},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'colour', title: __('Colour'), operate: 'LIKE'},
                         {field: 'url_type', title: __('Url_type'), searchList: {"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":'涓嶈烦杞�'}, formatter: Table.api.formatter.normal},

--
Gitblit v1.9.3