Merge branch 'feat-dingwf-mvp616' into develop

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/WorkbenchEngineersGanttRespDTO.java

 package com.alibaba.cloud.integration.order.dto;
 package com.alibaba.cloud.integration.order.dto;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
 
 
 import java.util.Date;
 import java.util.Date;
@@ -38,7 +39,8 @@ public class WorkbenchEngineersGanttRespDTO {
         /**
         /**
          * 是否休假
          * 是否休假
          */
          */
-        private boolean isHoliday;
+        @JsonProperty("isHoliday")
+        private boolean holiday;
         /**
         /**
          * 上班时间
          * 上班时间
          */
          */