diff --git a/app/Http/Controllers/Admin/ContentController.php b/app/Http/Controllers/Admin/ContentController.php
index 57a2cc95fa67dd505ad314f7fc56edcf11d90b97..589dc80014d6bf2d8917790c2e5691fc1bb17c7c 100644
--- a/app/Http/Controllers/Admin/ContentController.php
+++ b/app/Http/Controllers/Admin/ContentController.php
@@ -20,7 +20,7 @@ use Illuminate\View\View;
 
 class ContentController extends Controller
 {
-    protected $formNames = [];
+    protected $formNames = ['created_at', 'updated_at'];
 
     protected $entity = null;
 
@@ -64,6 +64,7 @@ class ContentController extends Controller
      * 内容列表数据接口
      *
      * @param Request $request
+     * @param integer $entity
      * @return array
      */
     public function list(Request $request, $entity)
@@ -74,6 +75,7 @@ class ContentController extends Controller
         }
 
         $perPage = (int) $request->get('limit', 50);
+        $this->formNames = array_merge($this->formNames, EntityFieldRepository::getFields($entity));
         $condition = $request->only($this->formNames);
 
         $data = ContentRepository::list($entity, $perPage, $condition);
@@ -116,7 +118,7 @@ class ContentController extends Controller
 
         try {
             ContentRepository::add($request->only(
-                EntityFieldRepository::getByEntityId($entity)->pluck('name')->toArray()
+                EntityFieldRepository::getFields($entity)
             ));
             return [
                 'code' => 0,
diff --git a/app/Repository/Admin/EntityFieldRepository.php b/app/Repository/Admin/EntityFieldRepository.php
index dcaf022222b7de426ba0e51343c9166783edc75a..0863dd369ef9845b9c68a4fc4cfcabe668d431a5 100644
--- a/app/Repository/Admin/EntityFieldRepository.php
+++ b/app/Repository/Admin/EntityFieldRepository.php
@@ -64,4 +64,10 @@ class EntityFieldRepository
         return  EntityField::query()->where('entity_id', $id)
             ->orderBy('order')->orderBy('is_show_inline')->get();
     }
+
+    public static function getFields($entityId)
+    {
+        return  EntityField::query()->select('name')->where('entity_id', $entityId)->get()
+            ->pluck('name')->toArray();
+    }
 }