Merge branch 'master' of http://git.cc-lotus.info/service-platform/service-live

app/controller/.dock.js

@@ -6,6 +6,7 @@ module.exports = {
       "start_time",
       "join_end",
       "user_id",
+      "province",
       "place",
     ],
   },
@@ -15,7 +16,7 @@ module.exports = {
   },
   update: {
     params: ["!id"],
-    requestBody: ["title", "desc", "start_time", "join_end", "status", "place"],
+    requestBody: ["title", "desc", "start_time", "join_end", "status","province", "place"],
   },
   show: {
     parameters: {
@@ -33,6 +34,7 @@ module.exports = {
         "user_id",
         "is_allowed",
         "status",
+        "province",
         "place",
       ],
     },

app/model/dock.js

@@ -26,6 +26,7 @@ const Dock = {
   is_allowed: { type: String, default: '0', maxLength: 1 }, // 0未审核;1已允许;2已拒绝
   reason: { type: String, required: false, maxLength: 200 }, // 拒绝理由
   user_id: { type: String, required: true, maxLength: 200 }, // 申请用户
+  province: { type: String, required: false }, // 省
   place: { type: String, required: false }, // 位置
 };
 const schema = new Schema(Dock, { toJSON: { virtuals: true } });