Merge tag '1.0.4' into develop

大理现场修改