hh

app/controller/.dock.js

@@ -18,9 +18,6 @@ module.exports = {
   },
   update: {
     params: ["!id"],
-<<<<<<< HEAD
-    requestBody: ["title", "desc", "start_time", "join_end", "status","province", "place", "file_path"],
-=======
     requestBody: [
       "title",
       "desc",
@@ -28,9 +25,9 @@ module.exports = {
       "join_end",
       "status",
       "province",
+      "file_path",
       "place",
     ],
->>>>>>> dbbe354904214a7be67765301d770fa35b46fc9c
   },
   show: {
     parameters: {