Merge pull request #5 from JohnCny/master

merge
Merge pull request #6 from JohnCny/master

merge
[add]固定资产加字段
Merge pull request #12 from tanwh/master

[add]固定资产加字段
Merge remote-tracking branch 'upstream/master'