From 007d832f9448b70cb2d0edb7ba04935f133b1cce Mon Sep 17 00:00:00 2001
From: reatang <tangtang1251@qq.com>
Date: Wed, 19 Oct 2022 23:25:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=86smallint=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=B9=9F=E7=BA=B3=E5=85=A5=E5=8D=95=E9=80=89=E6=A1=86=E7=9A=84?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/command/Crud.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php
index 390cb953d..6bc128637 100755
--- a/application/admin/command/Crud.php
+++ b/application/admin/command/Crud.php
@@ -1587,7 +1587,7 @@ EOD;
             $inputType = 'datetime';
         }
         // 指定后缀结尾且类型为enum,说明是个单选框
-        if ($this->isMatchSuffix($fieldsName, $this->enumRadioSuffix) && $v['DATA_TYPE'] == 'enum') {
+        if ($this->isMatchSuffix($fieldsName, $this->enumRadioSuffix) && $v['DATA_TYPE'] == 'enum' || $v['DATA_TYPE'] == 'smallint') {
             $inputType = "radio";
         }
         // 指定后缀结尾且类型为set,说明是个复选框
-- 
Gitee


From 87630bac8ff00e20dce239abe110e7dae996470d Mon Sep 17 00:00:00 2001
From: reatang <tangtang1251@qq.com>
Date: Wed, 26 Oct 2022 23:56:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9Armdir(XXXX):=20Text=20file=20bu?=
 =?UTF-8?q?sy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/command/Crud.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php
index 6bc128637..eea33cd1c 100755
--- a/application/admin/command/Crud.php
+++ b/application/admin/command/Crud.php
@@ -1295,6 +1295,7 @@ EOD;
                     $iterator = new \FilesystemIterator($parentDir);
                     $isDirEmpty = !$iterator->valid();
                     if ($isDirEmpty) {
+                        unset($iterator);
                         rmdir($parentDir);
                         $parentDir = dirname($parentDir);
                     } else {
-- 
Gitee