app/Http/Controllers/CharacteristicsController.php

@@ -109,8 +109,8 @@ class CharacteristicsController extends Controller
             ->get([
                 'line_id',
                 'machine_id',
-                'characteristics_type',
                 'name',
+                'characteristics_type',
                 'inspection_type',
                 'lower',
                 'middle',
@@ -2142,7 +2142,6 @@ class CharacteristicsController extends Controller
 
     public function getCharMaster(Request $request)
     {
-
         $expectedUser = env('API_AUTH_USER');
         $expectedPw = env('API_AUTH_PW');
         $header_auth = $request->header('Authorization');
@@ -2282,8 +2281,8 @@ class CharacteristicsController extends Controller
         $output = [
             'work_group_master' => $workGroupName ?? '',
             'name' => $charMaster?->name ?? '',
-            'inspection_type' => $charMaster?->inspection_type ?? '',
             'characteristics_type' => $charMaster?->characteristics_type ?? '',
+            'inspection_type' => $charMaster?->inspection_type ?? '',
             'lower' => (string) $charMaster?->lower ?? '',
             'middle' => (string) $charMaster?->middle ?? '',
             'upper' => (string) $charMaster?->upper ?? '',