fix 橫式標籤 bug
fix marquee
Merge branch 'develop'