劳动合同周期字段类型修改

@@ -115,26 +115,10 @@ public class TblSalaryBase implements Serializable {
 	@Excel(name = "全勤奖励", width = 15)
 	@Excel(name = "全勤奖励", width = 15)
     @ApiModelProperty(value = "全勤奖励")
     @ApiModelProperty(value = "全勤奖励")
     private BigDecimal fullAttendanceAward;
     private BigDecimal fullAttendanceAward;
-
-    /**合同周期开始时间*/
-    @Excel(name = "合同周期开始时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "合同周期开始时间")
-    private Date satrtTime;
-
-    /**合同周期结束时间*/
-    @Excel(name = "合同周期结束时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "合同周期结束时间")
-    private Date endTime;
 	/**劳动合同周期*/
 	/**劳动合同周期*/
-	@Excel(name = "劳动合同周期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "劳动合同周期", width = 25)
     @ApiModelProperty(value = "劳动合同周期")
     @ApiModelProperty(value = "劳动合同周期")
-    private Date contractTime;
+    private String contractTime;
 	/**创建人*/
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     @ApiModelProperty(value = "创建人")
     private String createBy;
     private String createBy;