From ed0423ead1786c0c3fb9437d8ae6f29839727270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= <jyp0036@gmail.com>
Date: Mon, 18 Mar 2024 22:34:19 +0900
Subject: [PATCH] =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/SQL/ShopItem.cs  | 3 +--
 Server/Service/Login.cs | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Server/SQL/ShopItem.cs b/Server/SQL/ShopItem.cs
index 9617bb8..744e4b9 100644
--- a/Server/SQL/ShopItem.cs
+++ b/Server/SQL/ShopItem.cs
@@ -11,7 +11,7 @@ namespace Server.SQL
         public long user_id { get; set; }
         public long id { get; set; }
         public long shop_item_data_id { get; set; }
-        public DateTime end_date { get; set; }
+        public DateTime buy_date { get; set; }
     }
 
     public class ShopItemSQL : SQL<ShopItem>
@@ -25,7 +25,6 @@ namespace Server.SQL
 
         public override List<ShopItem> SelectUid(long user_id)
         {
-            //현재 시간도 비교해서 이전날자가 들어가지 않게 하기
             return table.Where(data => data.user_id == user_id).ToList();
         }
     }
diff --git a/Server/Service/Login.cs b/Server/Service/Login.cs
index a6eb7ae..4557348 100644
--- a/Server/Service/Login.cs
+++ b/Server/Service/Login.cs
@@ -274,6 +274,7 @@ namespace Server.Service
             resp.consumable_item = itemManager.box.consumableItem;
             resp.etc_item = itemManager.box.etcItem;
             resp.reset_shop_item = resetShopItem;
+            resp.shop_item = shopItem;
             resp.status = 200;
             return resp.ToJson();
         }
@@ -307,5 +308,6 @@ namespace Server.Service
         public List<ConsumableItem> consumable_item;
         public List<EtcItem> etc_item;
         public List<ResetShopItem> reset_shop_item;
+        public List<ShopItem> shop_item;
     }
 }