diff --git a/game-server/app/services/playerCeService.ts b/game-server/app/services/playerCeService.ts
index 8cd9b3766..dfea75d7b 100644
--- a/game-server/app/services/playerCeService.ts
+++ b/game-server/app/services/playerCeService.ts
@@ -9,7 +9,7 @@ import { STATUS } from '../consts/statusCode';
 import {resResult } from '../pubUtils/util';
 import {HeroModel} from '../db/Hero';
 import {RoleModel} from '../db/Role';
-import { forEach } from 'pinus-robot/lib/common/util';
+
 //战力计算TODO
 export function calPlayerCe(hero:any) {
     let ce = 0;
diff --git a/shared/db/Equip.ts b/shared/db/Equip.ts
index 755e4bcf6..53d8039ee 100644
--- a/shared/db/Equip.ts
+++ b/shared/db/Equip.ts
@@ -1,7 +1,19 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop } from '@typegoose/typegoose';
 
+class RandSe {
+  @prop({ required: true })
+  seType: number;					// 属性类型
+  @prop({ required: true })
+  value: number;					// 属性数值
+}
 
+class Holes {
+  @prop({ required: true })
+  id: number;					// 宝石 id，待定，也可能是 type + lv
+  @prop({ required: true })
+  lv: number;					// 宝石等级
+}
 @index({ roleId: 1, hid: 1, id: 1 })
 @index({ seqId: 1 })
 export default class Equip extends BaseModel {
@@ -27,21 +39,15 @@ export default class Equip extends BaseModel {
   quality: number;				// 品质
   @prop({ required: true, default: 1 })
   lv: number;							// 强化等级
-  @prop({ required: false, default: [] })
-  randSe: [{							// 强化随机属性
-    seType: number;				// 属性类型
-    value: number;				// 属性数值
-  }];
+  @prop({ required: false, type: RandSe, default: [] })
+  randSe: RandSe[];							// 强化随机属性
 
   @prop({ required: true, default: 0 })
   randRange: number;			// 物攻策攻数值浮动上下限变化率，浮点数
   @prop({ required: true, default: 0 })
   initHoleCnt: number;		// 初始珠宝孔位个数
-  @prop({ required: true, default: [] })
-  holes: [{
-    id: number;						// 宝石 id，待定，也可能是 type + lv
-    lv: number;						// 宝石等级
-  }];
+  @prop({ required: true, type: Holes, default: [] })
+  holes: Holes[];
 
   public static async findbyRole(roleId: string, lean = true) {
     const equips = await EquipModel.find({ roleId }).lean(lean);
diff --git a/shared/db/Role.ts b/shared/db/Role.ts
index 88daf74cd..7c57789dc 100644
--- a/shared/db/Role.ts
+++ b/shared/db/Role.ts
@@ -22,6 +22,23 @@ class DungeonHero {
   @prop({ required: true, type: Number, default:[] })
   heroes: Array<number>; // 武将id
 }
+
+class PayRecord {
+    @prop({ required: true })
+    id: string;						// 购买项 product id
+    @prop({ required: true })
+    cnt: number;					// 购买次数
+}
+
+class WarStar {
+    @prop({ required: true })
+    id: number;						// 关卡 id
+    @prop({ required: true })
+    warType: number;      // 关卡类型
+    @prop({ required: true })
+    star: number;					// 星级
+}
+
 /**
   * 角色字段接口
 */
@@ -82,38 +99,15 @@ export default class Role extends BaseModel {
     @prop({ required: true, default: 0 })
     totalCost: number;			// 金币总花费
     @prop({ required: true, default: [] })
-    payRecord: [{						// 支付记录
-        id: string;						// 购买项 product id
-        cnt: number;					// 购买次数
-    }];
+    payRecord: PayRecord[];				// 支付记录
 
     @prop({ required: true, default: 0 })
     coin: number;						// 总铜钱
     @prop({ required: true, default: 0 })
     frdCnt: number;					// 情谊点
 
-    @prop({ required: true, default: [] })
-    souls: [{								// 将魂
-        id: number;						// 武将 id
-        count: number;					// 数量
-    }];
-    @prop({ required: true, default: [] })
-    pieces: [{							// 装备碎片
-        id: number;						// 装备 id
-        count: number;					// 数量
-    }];
-    @prop({ required: true, default: [] })
-    jewels: [{							// 珠宝
-        id: number;						// 待定，也可能是 type + lv
-        count: number;					// 数量
-    }];
-
-    @prop({ required: true, default: [] })
-    warStar: [{							// 关卡星级
-        id: number;						// 关卡 id
-        warType: number;      // 关卡类型
-        star: number;					// 星级
-    }];
+    @prop({ required: true, type: WarStar, default: [] })
+    warStar: WarStar[];						// 关卡星级
 
     @prop({ required: true, default: 1 })  
     loginCnt: number;				// 登录次数