123

@@ -955,11 +955,7 @@ class Car extends Base
             ->where("carmodel_id", $carmodel_id)
             ->where("carmodel_id", $carmodel_id)
             ->find();
             ->find();
         if(!$chartercar){
         if(!$chartercar){
-<<<<<<< HEAD
-            $this->error("111111111111111当前车型暂无包车");
-=======
-            $this->error("2222当前车型暂无包车");
->>>>>>> 5d2134c6016b7eddcbeb861feafdb05e40127173
+            $this->error("222当前车型暂无包车");
         }
         }
         $price = 0;
         $price = 0;
         $price = bcmul($charter_num, $chartercar['price'], 2);
         $price = bcmul($charter_num, $chartercar['price'], 2);