合并分支 'heshupeng' 到 'master'

商家入驻过期也显示商家入口



查看合并请求 !342

@@ -151,7 +151,7 @@ class User extends Api
                 'user_id' => $this->auth->id,
                 'store_id' => $store['id'],
                 'house_id' => $house['id'],
-                'end_time' => ['>',time()]
+                // 'end_time' => ['>',time()]
             ];
             $store_house = Db::name('store_house')->where($where_house)->count();
             if(!$store_house) {