Merge branch 'feature/v1' into develop

This commit is contained in:
钱涛 2022-04-19 10:42:01 +08:00
commit 982fffeb73
1 changed files with 20 additions and 46 deletions

View File

@ -1,5 +1,6 @@
package com.engine.salary.entity.salaryacct.dto;
import com.engine.salary.annotation.TableTitle;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -19,79 +20,52 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
public class SalaryAccEmployeeListDTO {
//主键id")
//主键id
private Long id;
//人员id")
//人员id
private Long employeeId;
// @SalaryTableColumn(
// label = "姓名",
// labelId = 85429,
// width = "10%"
// )
//姓名")
//姓名
@TableTitle(title = "姓名", dataIndex = "employeeName", key = "employeeName")
private String employeeName;
//个税扣缴义务人id")
private Long taxAgentId;
// @SalaryTableColumn(
// label = "个税扣缴义务人",
// labelId = 86184,
// width = "20%"
// )
//个税扣缴义务人")
//个税扣缴义务人
@TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName")
private String taxAgentName;
//部门id")
private Long departmentId;
// @SalaryTableColumn(
// label = "部门",
// labelId = 86185,
// width = "20%"
// )
//部门")
@TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName")
private String departmentName;
// @SalaryTableColumn(
// label = "手机号",
// labelId = 86186,
// width = "10%"
// )
//手机号")
//手机号
@TableTitle(title = "手机号", dataIndex = "mobile", key = "mobile")
private String mobile;
// @SalaryTableColumn(
// label = "工号",
// labelId = 86317,
// width = "10%"
// )
//工号")
@TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum")
private String jobNum;
// @SalaryTableColumn(
// label = "员工状态",
// labelId = 86187,
// width = "10%"
// )
//员工状态")
@TableTitle(title = "员工状态", dataIndex = "status", key = "status")
private String status;
// @SalaryTableColumn(
// label = "入职日期",
// labelId = 86319,
// width = "10%"
// )
//入职日期")
@TableTitle(title = "入职日期", dataIndex = "hireDate", key = "hireDate")
private String hireDate;
// @SalaryTableColumn(
// label = "离职日期",
// labelId = 95228,
// width = "10%"
// )
// //离职日期")
//离职日期
@TableTitle(title = "离职日期", dataIndex = "dismissDate", key = "dismissDate")
private String dismissDate;
}