bug fix

common/models/forms/DecPackageForm.php

@@ -114,13 +114,9 @@ class DecPackageForm extends Model
         $model->AMOUNT = $this->amount;
         $model->PV = $this->amountPv;
         $model->LEVEL_ID = $this->levelId;
-<<<<<<< HEAD
         $model->PACKAGE_CONTENT = $this->packageContent;
         $model->AMOUNT_STANDARD = $this->amountStandard;
-=======
-        $model->PACKAGE_CONTENT = $this->packageContent;
-		$model->STORE_NUMS = $this->storenums;
->>>>>>> feature/york-1590-orderkucun-0614
+        $model->STORE_NUMS = $this->storenums;
         if($model->save()){
             return $model;
         } else {