完善模型类

Change-Id: Id39fb19e5fd48e81c950b993d34f1fb68fc99aa7