From 864f1afc95a14b38c8fbf2cb359978b23c46eab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=83=E5=BD=A9=E6=9E=AB=E5=8F=B6?= <424235748@qq.com>
Date: Tue, 18 Jul 2023 03:14:54 +0000
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 七彩枫叶 <424235748@qq.com>
---
 extend/system/Form.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extend/system/Form.php b/extend/system/Form.php
index bd131ce..cc2970e 100644
--- a/extend/system/Form.php
+++ b/extend/system/Form.php
@@ -394,12 +394,11 @@ class FormBuilder
      */
     public function switch(array $data = []): string
     {
-        $value = $this->formtype ? '{$data.' . $data['name'] . '}' : '';
         $param = '$data.' . $data['name'];
         if ($this->formtype) {
             return <<<Eof
             <input  type="hidden" type="checkbox" name="{$data['name']}" value="0" />
-            <input type="checkbox" name="{$data['name']}" value="$value" <eq name="{$param}" value="1" > checked </eq> lay-skin="switch" />
+            <input type="checkbox" name="{$data['name']}" value="1" <eq name="{$param}" value="1" > checked </eq> lay-skin="switch" />
         Eof;
         }
         return <<<Eof

From d79e001bc1117e17594116b770c3960753635ed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=83=E5=BD=A9=E6=9E=AB=E5=8F=B6?= <424235748@qq.com>
Date: Tue, 18 Jul 2023 10:13:02 +0000
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E7=AA=97=E5=8F=A3=E5=AE=BD=E5=BA=A6=E5=B0=8F=E4=BA=8E?=
 =?UTF-8?q?920px=E6=97=B6=EF=BC=8C=E5=A4=9A=E5=9B=BE=E6=BA=A2=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 七彩枫叶 <424235748@qq.com>
---
 public/static/system/css/content.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/static/system/css/content.css b/public/static/system/css/content.css
index 762e81f..3fb1ac0 100644
--- a/public/static/system/css/content.css
+++ b/public/static/system/css/content.css
@@ -34,7 +34,7 @@ p.layui-clear {
 }
 
 .layui-imagesbox {
-    width: 810px;
+    width: 100%;
     overflow: hidden;
 }
 

From a70428585b8290a3ab06401caefb65cffe75bab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=83=E5=BD=A9=E6=9E=AB=E5=8F=B6?= <424235748@qq.com>
Date: Wed, 19 Jul 2023 03:04:24 +0000
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 七彩枫叶 <424235748@qq.com>
---
 app/admin/service/AdminGroupService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/admin/service/AdminGroupService.php b/app/admin/service/AdminGroupService.php
index 0140fe0..1910887 100644
--- a/app/admin/service/AdminGroupService.php
+++ b/app/admin/service/AdminGroupService.php
@@ -36,8 +36,8 @@ class AdminGroupService
      */
     public static function dataList(array $params = []): array
     {
-        $page = $params['page'] ?? 1;
-        $limit = $params['limit'] ?? 10;
+        $page = (int)$params['page'] ?? 1;
+        $limit = (int)$params['limit'] ?? 10;
         $where = [];
         if (!empty($param['title'])) {
             $where[] = ['title', 'like', '%' . $param['title'] . '%'];

From b4c7bcc71359bb5c38007d2524f5db5aa861f1ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=83=E5=BD=A9=E6=9E=AB=E5=8F=B6?= <424235748@qq.com>
Date: Mon, 24 Jul 2023 10:32:58 +0000
Subject: [PATCH 4/4] =?UTF-8?q?=E5=BD=93=E5=AD=97=E6=AE=B5=E4=B8=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B=E6=97=B6=EF=BC=8C=E6=8B=BC?=
 =?UTF-8?q?=E8=A3=85sql=E6=9D=A1=E4=BB=B6=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 七彩枫叶 <424235748@qq.com>
---
 app/AdminController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/AdminController.php b/app/AdminController.php
index fcbcbeb..7e51b1e 100644
--- a/app/AdminController.php
+++ b/app/AdminController.php
@@ -461,12 +461,12 @@ class AdminController extends BaseController
                                 continue 2;
                             }
 
-                            $exp = '=';
+                            $exp = 'between';
                             if ($arr[0] === '') {
-                                $exp = '<= TIME';
+                                $exp = '<=';
                                 $arr = $arr[1];
                             } elseif ($arr[1] === '') {
-                                $exp = '>= TIME';
+                                $exp = '>=';
                                 $arr = $arr[0];
                             }