fix 重融合

10 jobs for master in 1 minute and 19 seconds (queued for 7 seconds)
Status Job ID Name Coverage
  Prepare
passed #136729
linux
merge_databases

00:00:16

 
  Prepare2
passed #136730
linux
json

00:00:23

passed #136731
linux
json2

00:00:13

 
  Pack
passed #136732
linux
neos

00:00:19

passed #136733
linux
pack

00:00:09

passed #136734
linux
server

00:00:07

 
  Deploy
passed #136738
linux
deploy_to_koishi

00:00:19

passed #136737
linux
deploy_to_tiramisu

00:00:19

passed #136735
linux
upload_neos

00:00:13

passed #136736
linux
upload_version_json

00:00:13