bug

app/Models/AlbumAgentModel.php

@@ -41,25 +41,10 @@ class AlbumAgentModel extends BaseModel
      * @var string
      */
     protected $fillable = [
-<<<<<<< HEAD
-                           'store_id',
-                           'is_show_ma_price',
-                           'user_id',
-                           'phone',
-                           'address',
-                           'lat',
-                           'lon',
-                           'name',
-                           'status',
-                           'realname',
-                           'get_count',
-                           'share_times'
-                          ];
-=======
         'store_id',
         'is_show_ma_price',
         'user_id',
-        'ste_price_point',
+        'set_price_point',
         'phone',
         'address',
         'lat',
@@ -70,6 +55,6 @@ class AlbumAgentModel extends BaseModel
         'get_count',
         'share_times'
     ];
->>>>>>> master
+
 
 }