Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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; // 은행 계좌

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
Loading