Merge branch 'server' into web

박권수
Commit 4c17a55d40ced6f00c2ef69c1b4c5d1180045f1d 4c17a55d 2 parents 29ebfa36 b6fefa67
Showing 1 changed file with 4 additions and 2 deletions
server/src/api/bottle/bottle.ctrl.js
--- a/server/src/api/bottle/bottle.ctrl.js
View file @4c17a55
+++ b/server/src/api/bottle/bottle.ctrl.js
View file @4c17a55
@@ -156,13 +156,15 @@ exports.getBottleInfo = async(ctx) => {
 
         ctx.status = 200;
         ctx.body = {
+             bottle,
             takeMedicineHist,
         };
 
     } else {
-         ctx.status = 404;
+         ctx.status = 200;
         ctx.body = {
-             error : '정보가 등록되지 않은 약병'
+             bottle,
+             takeMedicineHist : [],
         }
     }