Commit 727e0fbe by liyanlin

fix

parent 36ee09ba
...@@ -38,7 +38,7 @@ public class ScheduleManageDTOAssembler implements Function<ScheduleManage, Sche ...@@ -38,7 +38,7 @@ public class ScheduleManageDTOAssembler implements Function<ScheduleManage, Sche
ScheduleServeDTO scheduleServeDTO = new ScheduleServeDTO(); ScheduleServeDTO scheduleServeDTO = new ScheduleServeDTO();
BeanUtils.copyProperties(scheduleServe, scheduleServeDTO); BeanUtils.copyProperties(scheduleServe, scheduleServeDTO);
if(scheduleServe.getServe() != null) { if(scheduleServe.getServe() != null) {
scheduleServeDTO.setTypeId(scheduleServe.getServe().getTypeId()); scheduleServeDTO.setSchId(scheduleServe.getServe().getSchTypeId());
} }
if (scheduleServe.getOwnProduce() != null) { if (scheduleServe.getOwnProduce() != null) {
scheduleServeDTO.setOwnProduce(scheduleServe.getOwnProduce()); scheduleServeDTO.setOwnProduce(scheduleServe.getOwnProduce());
......
...@@ -30,6 +30,9 @@ public class ScheduleServeDTO implements Serializable { ...@@ -30,6 +30,9 @@ public class ScheduleServeDTO implements Serializable {
@ApiModelProperty("预约id") @ApiModelProperty("预约id")
private Integer schId; private Integer schId;
@ApiModelProperty("预约分类")
private Integer schTypeId;
@ApiModelProperty("预约美甲师id") @ApiModelProperty("预约美甲师id")
private Integer technicianId; private Integer technicianId;
...@@ -83,9 +86,6 @@ public class ScheduleServeDTO implements Serializable { ...@@ -83,9 +86,6 @@ public class ScheduleServeDTO implements Serializable {
private BigDecimal discountRate; private BigDecimal discountRate;
@ApiModelProperty("服务类型ID")
private Integer typeId;
/** /**
* 预约款式vo * 预约款式vo
*/ */
......
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