Merge pull request #16 from JohnCny/master

Merge pull request #21 from tanwh/master
Merge pull request #17 from JohnCny/master

merge
Merge pull request #18 from JohnCny/master

merge
Merge pull request #24 from wangxu2013/master

[mod]库存录入方式
Merge pull request #19 from JohnCny/master

merge
Merge pull request #25 from wangxu2013/master

[mod]非标准检测界面修改
Merge pull request #20 from JohnCny/master

merge
[mod]md5
[mod]库存
[del]旧的"财务"以及"非财务"
Merge pull request #26 from tanwh/master

[mod]md5 [mod]库存 [del]旧的"财务"以及"非财务"
Merge remote-tracking branch 'upstream/master'