diff --git a/app/Http/Controllers/Api/V1/ApiController.php b/app/Http/Controllers/Api/V1/ApiController.php
index 673c043..90a2e9b 100644
--- a/app/Http/Controllers/Api/V1/ApiController.php
+++ b/app/Http/Controllers/Api/V1/ApiController.php
@@ -89,7 +89,7 @@ public function signup(Request $request)
         ]);
 
         if ($v->fails()) {
-            return ApiResponse::error($v->errors()->first(), 422);
+            return response()->json(['error' => $v->errors()->first()], 422);
         }
 
         $payload = $v->validated();
@@ -104,9 +104,7 @@ public function signup(Request $request)
                 'password' => $payload['password'], // 캐스트가 알아서 해싱
             ]);
 
-            return ApiResponse::response('result', [
-                'user' => $user->only(['id','user_id','name','email','phone']),
-            ]);
+            return ['user' => $user->only(['id','user_id','name','email','phone'])];
         });
     }
 
diff --git a/app/Http/Controllers/Api/V1/CommonController.php b/app/Http/Controllers/Api/V1/CommonController.php
index 319757c..6887263 100644
--- a/app/Http/Controllers/Api/V1/CommonController.php
+++ b/app/Http/Controllers/Api/V1/CommonController.php
@@ -9,8 +9,11 @@ class CommonController
 {
     public static function getComeCode()
     {
-        $query = DB::table('COM_CODE')
-            ->select(['CODE_TP_ID', 'CODE_ID', 'CODE_VAL', 'CODE_DESC', 'USE_YN']);
-        return ApiResponse::response('get', $query);
+        return ApiResponse::handle(function () {
+            DB::table('common_codes')
+                ->select(['code_group', 'code', 'name', 'description', 'is_active'])
+                ->where('tenant_id', app('tenant_id'))
+                ->get();
+        }, '공통코드');
     }
 }
diff --git a/app/Services/AdminService.php b/app/Services/AdminService.php
index 8e99d15..ac5df64 100644
--- a/app/Services/AdminService.php
+++ b/app/Services/AdminService.php
@@ -2,7 +2,6 @@
 
 namespace App\Services;
 
-use App\Helpers\ApiResponse;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
diff --git a/app/Services/Authz/AccessService.php b/app/Services/Authz/AccessService.php
index f872044..b4f5b3f 100644
--- a/app/Services/Authz/AccessService.php
+++ b/app/Services/Authz/AccessService.php
@@ -5,7 +5,6 @@
 use App\Models\Members\User;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Cache;
-use Carbon\Carbon;
 
 final class AccessService
 {
diff --git a/app/Services/Authz/RolePermissionService.php b/app/Services/Authz/RolePermissionService.php
index 50bf251..8b142bc 100644
--- a/app/Services/Authz/RolePermissionService.php
+++ b/app/Services/Authz/RolePermissionService.php
@@ -7,7 +7,6 @@
 use Spatie\Permission\Models\Role;
 use Spatie\Permission\Models\Permission;
 use Spatie\Permission\PermissionRegistrar;
-use App\Helpers\ApiResponse;
 
 class RolePermissionService
 {
diff --git a/app/Services/Authz/RoleService.php b/app/Services/Authz/RoleService.php
index d3b1547..4782bee 100644
--- a/app/Services/Authz/RoleService.php
+++ b/app/Services/Authz/RoleService.php
@@ -2,7 +2,6 @@
 
 namespace App\Services\Authz;
 
-use App\Helpers\ApiResponse;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
diff --git a/app/Services/Authz/UserRoleService.php b/app/Services/Authz/UserRoleService.php
index 080f01f..545bfa6 100644
--- a/app/Services/Authz/UserRoleService.php
+++ b/app/Services/Authz/UserRoleService.php
@@ -2,10 +2,8 @@
 
 namespace App\Services\Authz;
 
-use App\Helpers\ApiResponse;
 use App\Models\Members\User;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
 use Spatie\Permission\Models\Role;
 use Spatie\Permission\PermissionRegistrar;
 
diff --git a/app/Services/BomService.php b/app/Services/BomService.php
index 0bbf7ab..1159e73 100644
--- a/app/Services/BomService.php
+++ b/app/Services/BomService.php
@@ -4,7 +4,6 @@
 
 use App\Helpers\ApiResponse;
 use Illuminate\Support\Facades\DB;
-use App\Models\Products\CommonCode;
 use App\Models\Products\Bom;
 
 class BomService
diff --git a/app/Services/DepartmentService.php b/app/Services/DepartmentService.php
index 2d63dfc..fe52e88 100644
--- a/app/Services/DepartmentService.php
+++ b/app/Services/DepartmentService.php
@@ -2,7 +2,6 @@
 
 namespace App\Services;
 
-use App\Helpers\ApiResponse;
 use App\Models\Commons\Department;
 use App\Models\Commons\DepartmentPermission;
 use App\Models\Commons\DepartmentUser;
diff --git a/app/Services/FileService.php b/app/Services/FileService.php
index 5f44cbf..f2b6b11 100644
--- a/app/Services/FileService.php
+++ b/app/Services/FileService.php
@@ -2,7 +2,6 @@
 
 namespace App\Services;
 
-use App\Helpers\ApiResponse;
 use Illuminate\Support\Facades\DB;
 
 class FileService
diff --git a/app/Services/MemberService.php b/app/Services/MemberService.php
index b30cfd5..7b6a1b2 100644
--- a/app/Services/MemberService.php
+++ b/app/Services/MemberService.php
@@ -2,9 +2,6 @@
 
 namespace App\Services;
 
-use App\Helpers\ApiResponse;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Hash;
 use App\Models\Members\User;
 use App\Models\Tenants\Tenant;
diff --git a/app/Services/MenuService.php b/app/Services/MenuService.php
index 7af2d80..23de1b5 100644
--- a/app/Services/MenuService.php
+++ b/app/Services/MenuService.php
@@ -3,7 +3,6 @@
 namespace App\Services;
 
 use App\Models\Commons\Menu;
-use App\Helpers\ApiResponse;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
diff --git a/app/Services/MeterialService.php b/app/Services/MeterialService.php
index b90b73e..6bb51a9 100644
--- a/app/Services/MeterialService.php
+++ b/app/Services/MeterialService.php
@@ -2,9 +2,7 @@
 
 namespace App\Services;
 
-use App\Helpers\ApiResponse;
 use Illuminate\Support\Facades\DB;
-use App\Models\Products\CommonCode;
 use App\Models\Materials\Material;
 
 class MeterialService
diff --git a/app/Services/ModelService.php b/app/Services/ModelService.php
index 91d9f33..1c5fa01 100644
--- a/app/Services/ModelService.php
+++ b/app/Services/ModelService.php
@@ -2,10 +2,8 @@
 
 namespace App\Services;
 
-use App\Helpers\ApiResponse;
 use App\Models\Products\Bom;
 use Illuminate\Support\Facades\DB;
-use App\Models\Products\CommonCode;
 use App\Models\Products\Product;
 
 class ModelService
diff --git a/app/Services/ProductService.php b/app/Services/ProductService.php
index caf471c..888908c 100644
--- a/app/Services/ProductService.php
+++ b/app/Services/ProductService.php
@@ -2,7 +2,6 @@
 
 namespace App\Services;
 
-use App\Helpers\ApiResponse;
 use App\Models\Products\CommonCode;
 
 class ProductService
diff --git a/app/Services/TenantFieldSettingService.php b/app/Services/TenantFieldSettingService.php
index eaab1bf..92b4637 100644
--- a/app/Services/TenantFieldSettingService.php
+++ b/app/Services/TenantFieldSettingService.php
@@ -2,7 +2,6 @@
 
 namespace App\Services;
 
-use App\Helpers\ApiResponse;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
diff --git a/app/Services/TenantOptionGroupService.php b/app/Services/TenantOptionGroupService.php
index a6191da..31f212b 100644
--- a/app/Services/TenantOptionGroupService.php
+++ b/app/Services/TenantOptionGroupService.php
@@ -2,7 +2,6 @@
 
 namespace App\Services;
 
-use App\Helpers\ApiResponse;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Services/TenantOptionValueService.php b/app/Services/TenantOptionValueService.php
index 95982ca..df2073a 100644
--- a/app/Services/TenantOptionValueService.php
+++ b/app/Services/TenantOptionValueService.php
@@ -2,7 +2,6 @@
 
 namespace App\Services;
 
-use App\Helpers\ApiResponse;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
diff --git a/app/Services/TenantService.php b/app/Services/TenantService.php
index 6802546..dc79ab1 100644
--- a/app/Services/TenantService.php
+++ b/app/Services/TenantService.php
@@ -2,9 +2,6 @@
 
 namespace App\Services;
 
-use App\Helpers\ApiResponse;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
 use App\Models\Tenants\Tenant;
 use App\Models\Members\UserTenant;
diff --git a/app/Services/TenantUserProfileService.php b/app/Services/TenantUserProfileService.php
index 7252af2..88c5189 100644
--- a/app/Services/TenantUserProfileService.php
+++ b/app/Services/TenantUserProfileService.php
@@ -2,10 +2,7 @@
 
 namespace App\Services;
 
-use App\Helpers\ApiResponse;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Validator;
-
 use App\Models\Tenants\SettingFieldDef;
 use App\Models\Tenants\TenantFieldSetting;
 use App\Models\Tenants\TenantUserProfile;