Merge branch 'hotfix-phoenix' into develop

app/Admin/Controllers/v3/BannersController.php

@@ -33,9 +33,10 @@ class BannersController extends AdminController
             });
             $grid->column('title');
             $grid->column('cover_url')->image('',100);
-            $grid->column('bg_color')->display(function($bgColor){
-                return "<span style='display: block;background: $bgColor;width: 30px;height: 20px;'></span>";
-            });
+            $grid->column('bg_color')->editable();
+            // $grid->column('bg_color')->display(function($bgColor){
+            //     return "<span style='display: block;background: $bgColor;width: 30px;height: 20px;'></span>"; 
+            // });
             $grid->column('cover_type_text');
             $grid->column('path');
             $grid->column('path_type_text');