更新模板功能

app/admin/controller/Cms/Banner/BannerController.php

@@ -23,7 +23,7 @@ class BannerController extends BaseController
         try {
             $banners = Banner::where('delete_time', null)
                 ->where('tid', $this->getTenantId())
-                ->order('sort', 'asc')
+                ->order('sort desc, id desc')
                 ->field('id, title, desc, url, image, sort, create_time, update_time')
                 ->select()
                 ->toArray();

app/admin/controller/SiteSettingsController.php

@@ -34,6 +34,8 @@ class SiteSettingsController extends BaseController
                 'sitename' => '',
                 'logo' => '',
                 'logow' => '',
+                'ico' => '',
+                'companyintroduction' => '',
                 'description' => '',
                 'copyright' => '',
                 'companyname' => '',
@@ -44,6 +46,8 @@ class SiteSettingsController extends BaseController
                 'sitename' => $siteSetting->sitename ?? '',
                 'logo' => $siteSetting->logo ?? '',
                 'logow' => $siteSetting->logow ?? '',
+                'ico' => $siteSetting->ico ?? '',
+                'companyintroduction' => $siteSetting->companyintroduction ?? '',
                 'description' => $siteSetting->description ?? '',
                 'copyright' => $siteSetting->copyright ?? '',
                 'companyname' => $siteSetting->companyname ?? '',
@@ -85,12 +89,18 @@ class SiteSettingsController extends BaseController
         if (isset($rawData['sitename'])) {
             $siteSetting->sitename = (string)$rawData['sitename'];
         }
+        if (isset($rawData['companyintroduction'])) {
+            $siteSetting->companyintroduction = (string)$rawData['companyintroduction'];
+        }
         if (isset($rawData['logo'])) {
             $siteSetting->logo = (string)$rawData['logo'];
         }
         if (isset($rawData['logow'])) {
             $siteSetting->logow = (string)$rawData['logow'];
         }
+        if (isset($rawData['ico'])) {
+            $siteSetting->ico = (string)$rawData['ico'];
+        }
         if (isset($rawData['description'])) {
             $siteSetting->description = (string)$rawData['description'];
         }