presentation ppt updated
Merge remote-tracking branch 'origin/lei_dev' into dev
Merge remote-tracking branch 'origin/dev'
ppt updated
fixed a bug that busiid is not correctly updated when drag slider
ppt updated, bug fixed
a
Merge branch 'master' into hong_dev
face legend added
add more info in pop up
Merge remote-tracking branch 'origin/hong_dev' into dev
merge code
solve conflict