修正查看资产信息无法，baseinfo 错误
修正查看资产信息无法，baseinfo 错误
Merge branch 'liangnaihua' of github.com:zhuwowuyuing/deploy into liangnaihua
reslove conflict