productDev/funingyunwei.git

			@@ -12,6 +12,8 @@
			import com.baomidou.mybatisplus.annotation.TableName;
			import lombok.Data;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import org.springframework.format.annotation.DateTimeFormat;

			import java.util.Date;
			import java.math.BigDecimal;
			import java.util.List;
			@@ -60,8 +62,11 @@

			@ApiModelProperty(value = "开始时间")
			@ExcelColumn(name="计费开始日期",index = 10,width = 6,dateFormat = "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")
			private Date endDate;

			@@ -168,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)
			@@ -177,7 +186,7 @@
			@ApiModelProperty(value = "实收金额")
			@TableField(exist = false)
			@ExcelColumn(name="实收金额",index = 6,width = 6)
			private BigDecimal actReceivableFee;
			private BigDecimal actReceivableFee = BigDecimal.ZERO;

			@ApiModelProperty(value = "需收金额")
			@TableField(exist = false)