Merge branch 'patch-2' into 'master'

fix原石鸣狞

See merge request !41
10 jobs for master in 53 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Prepare
passed #123809
linux
merge_databases

00:00:09

 
  Prepare2
passed #123810
linux
json

00:00:15

passed #123811
linux
json2

00:00:13

 
  Pack
passed #123812
linux
neos

00:00:18

passed #123813
linux
pack

00:00:11

passed #123814
linux
server

00:00:08

 
  Deploy
passed #123818
linux
deploy_to_koishi

00:00:10

passed #123817
linux
deploy_to_tiramisu

00:00:09

passed #123815
linux
upload_neos

00:00:04

passed #123816
linux
upload_version_json

00:00:07