sovle conflict

common/models/psources/WalletChain.php

@@ -11,15 +11,12 @@ class WalletChain extends BaseActiveRecord
     const SCENARIOS_CREATE = 'create';
     const SCENARIOS_UPDATE = 'update';
 
-<<<<<<< HEAD
-=======
     const STATUS_NO = 0; //创建失败
     const STATUS_YES = 1; //创建成功
 
     const ORIGIN_MANAGE = 1; //管理员创建
     const ORIGIN_USER = 2;  //h5用户创建
 
->>>>>>> feature/ticker
     public static function getDb()
     {
         return Yii::$app->get('p_sources');
@@ -44,11 +41,8 @@ class WalletChain extends BaseActiveRecord
             'host' => '钱包服务IP',
             'port' => '钱包服务端口',
             'wallet_address' => '钱包地址',
-<<<<<<< HEAD
-=======
             'status' => '申请状态',
             'origin' => '创建人',
->>>>>>> feature/ticker
             'hash' => '申请费用hash'
         ];
     }
@@ -56,33 +50,20 @@ class WalletChain extends BaseActiveRecord
     public function rules()
     {
         return [
-<<<<<<< HEAD
-            [['platform', 'address', 'private_key', 'execer', 'brower_url', 'token', 'host', 'wallet_address', 'hash', 'port', 'fee'], 'required'],
-            [['platform', 'address', 'private_key', 'execer', 'brower_url', 'token', 'host', 'wallet_address', 'hash'], 'string'],
-            [['platform'], 'string', 'length' => [1, 30]],
-            [['token'], 'string', 'length' => [1, 10]],
-            [['port'], 'integer']
-=======
             [['platform', 'address', 'private_key', 'execer', 'brower_url', 'token', 'host', 'wallet_address', 'status', 'port', 'fee', 'origin', 'hash'], 'required'],
             [['platform', 'address', 'private_key', 'execer', 'brower_url', 'token', 'host', 'wallet_address', 'hash'], 'string'],
             [['platform'], 'string', 'length' => [1, 30]],
             [['token'], 'string', 'length' => [1, 10]],
             [['port', 'status', 'origin'], 'integer']
->>>>>>> feature/ticker
         ];
     }
 
     public function scenarios()
     {
         $scenarios = [
-<<<<<<< HEAD
-            self:: SCENARIOS_CREATE => ['platform', 'token', 'address',  'private_key', 'fee', 'host', 'port', 'wallet_address', 'hash'],
-            self:: SCENARIOS_UPDATE => ['platform', 'token', 'address',  'private_key', 'fee', 'host', 'port', 'wallet_address', 'hash'],
-=======
             self:: SCENARIOS_CREATE => ['platform', 'token', 'address',  'private_key', 'fee', 'host', 'port', 'wallet_address', 'status', 'origin', 'hash'],
             self:: SCENARIOS_UPDATE => ['status'],
->>>>>>> feature/ticker
         ];
         return array_merge(parent:: scenarios(), $scenarios);
     }
-}
\ No newline at end of file
+}