篩選按鈕傳值

原本沒合到sor
Merge branch 'devlop' into feature/bird1204