Merge branch 'origin/develop'
Merge branch 'origin/develop'
維修結束直接跳到首頁
makefile db-update 重覆
Merge branch 'origin/master'
fix event show layout