Merge branch 'develop' into feature/mzl_dev

# Conflicts:
#	config/route.php

app/admin/logic/SysConfigLogic.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace app\admin\logic;
+
+use app\common\traits\crud\CrudLogicTrait;
+use app\common\model\SysConfig;
+
+class SysConfigLogic
+{
+    use CrudLogicTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = SysConfig::class;
+
+}