From 62408b5041c90544eae49676a2dbcd25ccb78010 Mon Sep 17 00:00:00 2001
From: "as2252258@163.com" <as22522582>
Date: Thu, 29 Apr 2021 01:05:02 +0800
Subject: [PATCH] modify

---
 Database/Mysql/Columns.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Database/Mysql/Columns.php b/Database/Mysql/Columns.php
index e9bb3e33..9a5748a7 100644
--- a/Database/Mysql/Columns.php
+++ b/Database/Mysql/Columns.php
@@ -112,7 +112,7 @@ class Columns extends Component
 	 */
 	public function decode($val, $format = null): mixed
 	{
-		if (empty($format)) {
+		if (empty($format) || $val === null) {
 			return $val;
 		}
 		$format = strtolower($format);