modify data access because of data structure modification
Merge branch 'master' of https://github.com/yanghua/FixedAssetManager_Server

Conflicts:
	proxy/stockOut.js