fix the bug from order panel
Merge branch 'master' of https://github.com/d14123081/team4.git