111

@@ -11,7 +11,7 @@ use app\common\controller\Api;
 use think\Db;
 
 /**
- * 首页接口
+ * 首页接口1112
  */
 class Car extends Base
 {
@@ -955,7 +955,11 @@ class Car extends Base
             ->where("carmodel_id", $carmodel_id)
             ->find();
         if(!$chartercar){
+<<<<<<< HEAD
             $this->error("111111111111111当前车型暂无包车");
+=======
+            $this->error("2222当前车型暂无包车");
+>>>>>>> 5d2134c6016b7eddcbeb861feafdb05e40127173
         }
         $price = 0;
         $price = bcmul($charter_num, $chartercar['price'], 2);