10 Commits (844fe2c25075966ed63d3cf45e4c72acf327f996)

Author	SHA1	Message	Date
wangyong	1e41b79611	fix merge bug	2015-11-15 23:29:31 +08:00
ibuler	5d33493233	asset js	2015-11-15 23:21:59 +08:00
ibuler	3b07198b8a	merge with cmdb	2015-11-15 19:57:25 +08:00
wangyong	0f29745bfa	asset add batch	2015-11-14 23:09:13 +08:00
halcyon	e77ec102d9	just do it	2015-11-08 22:39:30 +08:00
wangyong	0c0f05b6d9	jasset base	2015-11-03 17:07:46 +08:00
halcyon	46b1aca5f1	model	2015-10-31 09:23:10 +08:00
Administrator	699046dad5	修改settings	2015-10-05 23:48:03 +08:00
ibuler	907c2c7e97	资产修改基本完成	2015-09-10 22:51:42 +08:00
ibuler	8bf9103fcf	修改资产管理	2015-09-09 00:19:17 +08:00