Commit 8695b6a3 authored by Huangnan's avatar Huangnan

Merge branch 'patch-4' into 'master'

fix原石号咆、原石鸣狞

See merge request !46
parents 49c5f589 bb4f05db
Pipeline #27708 passed with stages
in 50 seconds