优化信息块模板逻辑
Merge remote-tracking branch 'origin/master'