From 8dfebd055ce95d4f18d4ef87084f8ff0d9dcd982 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 15 Dec 2021 11:57:45 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20mergeQueryColumn=EC=9D=98=20=EA=B8=B0?=
 =?UTF-8?q?=EB=B3=B8=20=EA=B0=92=EC=97=90=20npc=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/General.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php
index b232e0e4..966b7ce5 100644
--- a/hwe/sammo/General.php
+++ b/hwe/sammo/General.php
@@ -1083,9 +1083,9 @@ class General implements iAction
 
     static public function mergeQueryColumn(?array $reqColumns = null, int $constructMode = 2): array
     {
-        $minimumColumn = ['no', 'name', 'city', 'nation', 'officer_level', 'officer_city'];
+        $minimumColumn = ['no', 'name', 'npc', 'city', 'nation', 'officer_level', 'officer_city'];
         $defaultEventColumn = [
-            'no', 'name', 'owner', 'city', 'nation', 'officer_level', 'officer_city',
+            'no', 'name', 'npc', 'owner', 'city', 'nation', 'officer_level', 'officer_city',
             'special', 'special2', 'personal',
             'horse', 'weapon', 'book', 'item', 'last_turn', 'aux',
         ];