Merge branch 'master' into wxw

wxw

2024-08-17 0464969366317154fdbb51e106ca778b855bdd08

 HTML/views/SystemSettings/Interface.html

@@ -165,6 +165,7 @@
               height: h1,
               id: 'LAY-app-content-list',
               where: param,
					
               contentType: 'application/json',
               headers:{ToKen:$.cookie('token')},
               page: true,
@@ -295,6 +296,7 @@
               height: h2,
               id: 'LAY-app-content-list2',
               where: param,
					
               contentType: 'application/json',
               toolbar:'',
               defaultToolbar:  '', //'print', 'exports'