完善相关应用的触发
合并冲突
Merge remote-tracking branch 'origin/develop' into develop