added more field when query
Merge branch 'master' of https://github.com/yanghua/FixedAssetManager_Server

Conflicts:
	proxy/stockOut.js