Pre Merge pull request !519 from 端木/1.x-dev

application/admin/model/AuthRule.php

@@ -16,7 +16,11 @@ class AuthRule extends Model
     // 数据自动完成字段
     protected $insert = ['py', 'pinyin'];
     protected $update = ['py', 'pinyin'];
-    // 拼音对象
+
+    /**
+     * 拼音对象
+     * @var \Overtrue\Pinyin\Pinyin|null
+     */
     protected static $pinyin = null;
 
     protected static function init()

composer.json

@@ -23,7 +23,7 @@
         "topthink/think-helper": "^1.0.7",
         "fastadminnet/fastadmin-addons": "~1.4.3",
         "fastadminnet/fastadmin-mailer": "^2.1.1",
-        "overtrue/pinyin": "^3.0",
+        "overtrue/pinyin": "^6.0",
         "phpoffice/phpspreadsheet": "^1.29.11",
         "overtrue/wechat": "^5.36.3",
         "ext-json": "*",