Browse Source

fix model time Bug

qh 2 years ago
parent
commit
524f24842c

+ 4 - 4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusBookingBatch.java

@@ -41,14 +41,14 @@ public class BusBookingBatch implements Serializable {
     @ApiModelProperty(value = "批次号")
     private String batchNo;
 	/**预计抵达时间*/
-	@Excel(name = "预计抵达时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@Excel(name = "预计抵达时间", width = 15, format = "yyyy-MM-dd HH:mm")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "预计抵达时间")
     private Date arrivalTime;
 	/**预离时间*/
-	@Excel(name = "预离时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@Excel(name = "预离时间", width = 15, format = "yyyy-MM-dd HH:mm")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "预离时间")
     private Date dueOutTime;