Merge remote-tracking branch 'origin/master'

app/Service/CustomFieldSettingService.php

@@ -38,9 +38,12 @@ class CustomFieldSettingService extends Service
 
             $update = $msg['data'][0];
             $id = $update['id'];
-            unset($update['id']);
             $model = new CustomFieldDefinitions();
-            $model->where('id', $id)->update($update);
+            $model->where('id', $id)->update([
+                'menu_id' => $update['menu_id'],
+                'field_label' => $update['field_label'],
+                'field_type' => $update['field_type'],
+            ]);
 
             DB::commit();
         }catch (\Exception $exception){
@@ -164,7 +167,7 @@ class CustomFieldSettingService extends Service
             if($bool) return [false,'自定义设置已存在'];
         }
 
-        return [true, ''];
+        return [true, $data];
     }
 
     public static function syncCustomFieldData($id, $data, $user)