Merge branch 'master' into 3.1

limingxinleo · limingxinleo · commit c25cc34abbf4 · 2023-11-24T10:05:37.000+08:00
# Conflicts:
#	.github/workflows/test-components.yml
#	.github/workflows/test.yml
diff --git a/composer.json b/composer.json
@@ -3,6 +3,7 @@
     "type": "library",
     "license": "MIT",
     "keywords": [
+        "dev",
         "php",
         "hyperf"
     ],
