bug and stocktake

bug and stocktake
Merge branch 'master' of https://github.com/donnykoo/EXTJS-VENUS-FRAMEWORK