From 682e95561d1e4d61e61dfb5ea8bcfd6af5bcd77e Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Tue, 13 Oct 2020 17:11:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=20=E6=96=B0=E5=A2=9E=E6=AD=A6?=
 =?UTF-8?q?=E5=B0=86=E3=80=81=E8=A3=85=E5=A4=87=EF=BC=8C=E7=AD=89=E7=BA=A7?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/db/Equip.ts | 2 +-
 shared/db/Hero.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared/db/Equip.ts b/shared/db/Equip.ts
index de5784303..2b1e9d2bd 100644
--- a/shared/db/Equip.ts
+++ b/shared/db/Equip.ts
@@ -48,7 +48,7 @@ export default class Equip extends BaseModel {
   
   public static async createEquip(equipInfo: {roleId: string, roleName: string, eid: number, seqId: number, type: number, eName: string, lv?: number}, lean = true) {
     const doc = new EquipModel();
-    const update = Object.assign(equipInfo, doc.toJSON());
+    const update = Object.assign(doc.toJSON(), equipInfo);
     const equip = await EquipModel.findOneAndUpdate({ seqId: equipInfo.seqId }, update, {upsert: true, new: true}).lean(lean);
     return equip;
   }
diff --git a/shared/db/Hero.ts b/shared/db/Hero.ts
index 00d5aa97d..f946bd0ac 100644
--- a/shared/db/Hero.ts
+++ b/shared/db/Hero.ts
@@ -70,7 +70,7 @@ export default class Hero extends BaseModel {
 
   public static async createHero(heroInfo: {roleId: string, roleName: string, hid: number, hName: string, seqId: number, lv?:number}, lean = true) {
     const doc = new HeroModel();
-    const update = Object.assign(heroInfo, doc.toJSON());
+    const update = Object.assign(doc.toJSON(), heroInfo);
     const hero = await HeroModel.findOneAndUpdate({roleId: heroInfo.roleId, hid: heroInfo.hid}, update, {upsert: true, new: true}).lean(lean);
     return hero;
   }