bug fixed
Merge branch 'master' of github.com:zhs490770/ZJU-cs-basic-opt