Merge remote-tracking branch 'upstream/main'

backend-node/src/services/screenManagementService.ts

@@ -2154,9 +2154,9 @@ export class ScreenManagementService {
           targetCompanyCode, // 대상 회사 코드 사용
           sourceScreen.table_name,
           sourceScreen.is_active,
-          copyData.userId,
+          copyData.createdBy,
           new Date(),
-          copyData.userId,
+          copyData.createdBy,
           new Date(),
         ]
       );
@@ -2268,7 +2268,7 @@ export class ScreenManagementService {
       screenCode: data.mainScreen.screenCode,
       description: data.mainScreen.description || "",
       companyCode: data.companyCode,
-      userId: data.userId,
+      createdBy: data.userId,
       targetCompanyCode: data.targetCompanyCode, // 대상 회사 코드 전달
     });
 
@@ -2284,7 +2284,7 @@ export class ScreenManagementService {
         screenCode: modalData.screenCode,
         description: "",
         companyCode: data.companyCode,
-        userId: data.userId,
+        createdBy: data.userId,
         targetCompanyCode: data.targetCompanyCode, // 대상 회사 코드 전달
       });