合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen 查看合并请求 !284

合并分支 'Branch_liuzhen' 到 'master'
Branch liuzhen 查看合并请求 !284
刘朕
application/api/controller/Hot.php
application/api/controller/Store.php
application/api/model/Message.php
--- a/application/api/controller/Hot.php
查看文件 @93003b1
+++ b/application/api/controller/Hot.php
查看文件 @93003b1
@@ -202,6 +202,9 @@ class Hot extends Api
             "province": "地址省",
             "city": "市",
             "region": "区",
+            "address": "详细地址",
+            "lat": "纬度",
+            "lng": "经度",
             "images": "/assets/img/qrcode.png,/assets/img/qrcode.png",
             "content": "店铺详情",
             "image_arr"店铺轮播: [
--- a/application/api/controller/Store.php
查看文件 @93003b1
+++ b/application/api/controller/Store.php
查看文件 @93003b1
@@ -491,6 +491,9 @@ class Store extends Api
      * @ApiParams   (name="province", type="string", required=true, description="省")
      * @ApiParams   (name="city", type="string", required=true, description="市")
      * @ApiParams   (name="region", type="string", required=true, description="区")
+     * @ApiParams   (name="address", type="string", required=false, description="详细地址")
+     * @ApiParams   (name="lat", type="string", required=false, description="纬度")
+     * @ApiParams   (name="lng", type="string", required=false, description="经度")
      * @ApiParams   (name="images", type="string", required=true, description="宣传图/轮播图")
      * @ApiReturnParams   (name="code", type="integer", required=true, sample="0")
      * @ApiReturnParams   (name="msg", type="string", required=true, sample="返回成功")
--- a/application/api/model/Message.php
查看文件 @93003b1
+++ b/application/api/model/Message.php
查看文件 @93003b1
@@ -11,4 +11,8 @@ class Message extends Base
     {
         return date('Y-m-d H:i:s',$value);
     }
+    public function getUpdatetimeAttr($value)
+    {
+        return date('Y-m-d H:i:s',$value);
+    }
 }