Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 46fa24d6 by 丁伟峰
Options

Merge branch 'feat-dingwf-mvp616' into develop

2 parents b8e72486 d864cc4c
Inline Side-by-side
Showing with 3 additions and 1 deletions
project-order/src/main/java/com/alibaba/cloud/integration/order/dto/WorkbenchEngineersGanttRespDTO.java
package com.alibaba.cloud.integration.order.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.experimental.Accessors;
import java.util.Date;
......@@ -38,7 +39,8 @@ public class WorkbenchEngineersGanttRespDTO {
/**
* 是否休假
*/
private boolean isHoliday;
@JsonProperty("isHoliday")
private boolean holiday;
/**
* 上班时间
*/
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!