Merge remote-tracking branch 'origin/1.0' into 1.0

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunAskForLeaveDO.java

@@ -10,7 +10,7 @@ import net.sf.json.JSONArray;
 import org.springframework.beans.BeanUtils;
 import javax.persistence.Entity;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
 
@@ -54,13 +54,13 @@ public class ChuanyunAskForLeaveDO extends BasicDO {
      * 创建时间
      */
     @JsonProperty("create_time")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 结束时间
      */
     @JsonProperty("finish_time")
-    private Date finishTime;
+    private LocalDateTime finishTime;
 
 
     @JsonProperty("main_process_instance_id")