From 03bfe24893d0ac07f3a171c300567bd7715916da Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Fri, 31 Dec 2021 18:18:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96addtion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化blockquote字体大小
---
 application/common.php                           | 2 +-
 application/config.php                           | 4 ++--
 public/assets/less/bootstrap-less/variables.less | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/common.php b/application/common.php
index b331b135..a014f80b 100755
--- a/application/common.php
+++ b/application/common.php
@@ -250,7 +250,7 @@ if (!function_exists('addtion')) {
                 $model = $v['name'] ? \think\Db::name($v['name']) : \think\Db::table($v['table']);
             }
             $primary = $v['primary'] ? $v['primary'] : $model->getPk();
-            $result[$v['field']] = isset($ids[$v['field']]) ? $model->where($primary, 'in', $ids[$v['field']])->column("{$primary},{$v['column']}") : [];
+            $result[$v['field']] = isset($ids[$v['field']]) ? $model->where($primary, 'in', $ids[$v['field']])->column($v['column'], $primary) : [];
         }
 
         foreach ($items as $k => &$v) {
diff --git a/application/config.php b/application/config.php
index 33962196..8a058ffa 100755
--- a/application/config.php
+++ b/application/config.php
@@ -277,7 +277,7 @@ return [
         'multiplenav'           => false,
         //是否开启多选项卡(仅在开启多级菜单时起作用)
         'multipletab'           => true,
-        //后台皮肤,为空时表示使用skin-black-green
+        //后台皮肤,为空时表示使用skin-black-blue
         'adminskin'             => '',
         //后台是否启用面包屑
         'breadcrumb'            => false,
@@ -292,7 +292,7 @@ return [
         //允许跨域的域名,多个以,分隔
         'cors_request_domain'   => 'localhost,127.0.0.1',
         //版本号
-        'version'               => '1.2.2.20211011_beta',
+        'version'               => '1.3.0.20220101',
         //API接口地址
         'api_url'               => 'https://api.fastadmin.net',
     ],
diff --git a/public/assets/less/bootstrap-less/variables.less b/public/assets/less/bootstrap-less/variables.less
index dfbf87e2..f24764cb 100755
--- a/public/assets/less/bootstrap-less/variables.less
+++ b/public/assets/less/bootstrap-less/variables.less
@@ -849,7 +849,7 @@
 //** Blockquote small color
 @blockquote-small-color: @gray-light;
 //** Blockquote font size
-@blockquote-font-size: (@font-size-base * 1.25);
+@blockquote-font-size: ceil(@font-size-base * 1.05);
 //** Blockquote border color
 @blockquote-border-color: @gray-lighter;
 //** Page header border color