productDev/funingyunwei.git

			@@ -62,11 +62,12 @@

			@ApiModelProperty(value = "开始时间")
			@ExcelColumn(name="计费开始日期",index = 10,width = 6,dateFormat = "yyyy-MM-dd")
			@DateTimeFormat(pattern = "yyyy-MM-dd")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date startDate;

			@ApiModelProperty(value = "结束时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@ExcelColumn(name="计费结束日期",index = 11,width = 6,dateFormat = "yyyy-MM-dd")
			@DateTimeFormat(pattern = "yyyy-MM-dd")
			private Date endDate;

			@ApiModelProperty(value = "实际付款日")
			@@ -75,7 +76,6 @@

			@ApiModelProperty(value = "计划付款日")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@DateTimeFormat(pattern = "yyyy-MM-dd")
			private Date planPayDate;

			@ApiModelProperty(value = "合同条款编码（关联yw_contract_detail)", example = "1")
			@@ -173,6 +173,10 @@
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date planPayDateStart;

			@ApiModelProperty(value = "创建人名称")
			@ExcelColumn(name="创建人",index = 9,width = 10)
			@TableField(exist = false)
			private String realname;

			@ApiModelProperty(value = "计划付款日 - 结束")
			@TableField(exist = false)