Commit e7db313e by ilal Committed by chenzg

修改字段

parent 5737ff20
......@@ -33,16 +33,16 @@ public class TimeCardController {
List<LeaveTypeDto> leas = new ArrayList<LeaveTypeDto>();
LeaveTypeDto lea = LeaveTypeDto.builder().build();
lea.setVacid(1);
lea.setVacname("事假");
lea.setId(1);
lea.setValue("事假");
leas.add(lea);
LeaveTypeDto lea2 = LeaveTypeDto.builder().build();
lea2.setVacid(2);
lea2.setVacname("调休");
lea2.setId(2);
lea2.setValue("调休");
leas.add(lea2);
LeaveTypeDto lea3 = LeaveTypeDto.builder().build();
lea3.setVacid(3);
lea3.setVacname("病假");
lea3.setId(3);
lea3.setValue("病假");
leas.add(lea3);
return ResultUtil.data(leas, "操作成功!");
......@@ -59,12 +59,12 @@ public class TimeCardController {
List<CompensateDto> coms = new ArrayList<CompensateDto>();
CompensateDto com = CompensateDto.builder().build();
com.setOvtiid(1);
com.setOvtiname("加班费");
com.setId(1);
com.setValue("加班费");
coms.add(com);
CompensateDto coms2 = CompensateDto.builder().build();
coms2.setOvtiid(2);
coms2.setOvtiname("调休");
coms2.setId(2);
coms2.setValue("调休");
coms.add(coms2);
return ResultUtil.data(coms, "操作成功!");
......
......@@ -13,8 +13,8 @@ import lombok.NoArgsConstructor;
public class CompensateDto {
@ApiModelProperty(value = "加班补偿记录id", example = "1", required = true)
private Integer ovtiid;
private Integer id;
@ApiModelProperty(value = "加班补偿名称", example = "加班费、调休")
private String ovtiname;
private String value;
}
......@@ -14,8 +14,8 @@ import lombok.NoArgsConstructor;
public class LeaveTypeDto {
@ApiModelProperty(value = "假期记录id", example = "1", required = true)
private Integer vacid;
private Integer id;
@ApiModelProperty(value = "假期名称", example = "事假、调休...")
private String vacname;
private String value;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment