Merge branch 'master' into feature/backend

# Conflicts:
#	game-server/app/servers/connector/handler/entryHandler.ts
#	game-server/app/servers/role/handler/itemHandler.ts
#	shared/consts/constModules/sysConst.ts
#	shared/pubUtils/util.ts
#	web-server/app.ts
#	web-server/app/service/Auth.ts

shared/db/Equip.ts

@@ -126,9 +126,10 @@ export default class Equip extends BaseModel {
         return result;
     }
     public static async deleteEquips(roleId: string, ids: Array<number>) {
-        let result = await EquipModel.deleteMany({ roleId, seqId: { $in: ids } });
+        let equips = await EquipModel.getEquips(roleId, ids);
+        await EquipModel.deleteMany({ roleId, seqId: { $in: ids } });
         await RoleModel.findOneAndUpdate({ roleId }, { $inc: { equipCount: -1 * ids.length } }, { new: true });
-        return result;
+        return equips;
     }
 
     public static async getEquipsByID(ids: Array<string>) {