From b0ccbc71d1899ac4f0887b4657d6eb4ace488033 Mon Sep 17 00:00:00 2001 From: koyy418 Date: Sat, 10 May 2025 21:08:40 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B5=9C=EC=A2=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/barion/capstoneprojectbarion/Entity/Employee.java | 4 ++-- .../java/me/barion/capstoneprojectbarion/dto/EmployeeDto.java | 2 +- .../barion/capstoneprojectbarion/service/EmployeeService.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/barion/capstoneprojectbarion/Entity/Employee.java b/src/main/java/me/barion/capstoneprojectbarion/Entity/Employee.java index 6385fc0..9117886 100644 --- a/src/main/java/me/barion/capstoneprojectbarion/Entity/Employee.java +++ b/src/main/java/me/barion/capstoneprojectbarion/Entity/Employee.java @@ -24,8 +24,8 @@ public class Employee { @Column(name = "phone_number", nullable = false, length = 100) private String phoneNumber; - @Column(name = "hourly_wage", nullable = false) - private Integer hourlyWage; + @Column(name = "salary", nullable = false) + private Integer salary; @Column(name = "position", nullable = false, length = 100) private String position; diff --git a/src/main/java/me/barion/capstoneprojectbarion/dto/EmployeeDto.java b/src/main/java/me/barion/capstoneprojectbarion/dto/EmployeeDto.java index 72848f7..f0de77d 100644 --- a/src/main/java/me/barion/capstoneprojectbarion/dto/EmployeeDto.java +++ b/src/main/java/me/barion/capstoneprojectbarion/dto/EmployeeDto.java @@ -11,7 +11,7 @@ public class EmployeeDto { private Integer storeId; // 매장 ID private String employeeName; // 직원 이름 private String phoneNumber; // 전화번호 - private Integer hourlyWage; // 시간당 급여 + private Integer salary; // 시간당 급여 private String position; // 직책 private String bankAccount; // 은행 계좌 diff --git a/src/main/java/me/barion/capstoneprojectbarion/service/EmployeeService.java b/src/main/java/me/barion/capstoneprojectbarion/service/EmployeeService.java index d308b10..7d4b242 100644 --- a/src/main/java/me/barion/capstoneprojectbarion/service/EmployeeService.java +++ b/src/main/java/me/barion/capstoneprojectbarion/service/EmployeeService.java @@ -42,7 +42,7 @@ public Employee createEmployee(EmployeeDto employeeDto) { employee.setStoreId(employeeDto.getStoreId()); employee.setEmployeeName(employeeDto.getEmployeeName()); employee.setPhoneNumber(employeeDto.getPhoneNumber()); - employee.setHourlyWage(employeeDto.getHourlyWage()); + employee.setSalary(employeeDto.getSalary()); employee.setPosition(employeeDto.getPosition()); employee.setBankAccount(employeeDto.getBankAccount());