Merge branch 'test'

application/api_broker/controller/Shop.php

@@ -258,7 +258,7 @@ class Shop extends Basic
         //todo 这里的是否要更改成b端后台上传的类型
         $param["img_type"]     = 2;
         $result["images"]      = $this->gHousesImgModel->getHouseImages($param, 15);
-        $param["img_type"]     = 4;//图片类型:1效果图，2实景图，3样板图，4户型图，5交通图
+        $param["img_type"]     = 3;//图片类型:1效果图，2实景图，3样板图，4户型图，5交通图
         $result["plan_images"] = $this->gHousesImgModel->getHouseImages($param, 1);
 
         if ($result['status'] == 0) {

application/index/controller/Member.php

@@ -141,7 +141,7 @@ class Member extends Basic{
 
             //注册时间
             if (!empty($params['registration_end']) && empty($params['registration_start'])) {
-                $where['a.registration_time'] = ['< time',$params['registration_start']. ' 23:59:59'];
+                $where['a.registration_time'] = ['< time',$params['registration_end']. ' 23:59:59'];
             }
 
             //注册时间