productDev/funingyunwei.git

			@@ -90,8 +90,8 @@
			@ExcelColumn(name="应收金额",index = 5,width = 6)
			private BigDecimal receivableFee;

			@ApiModelProperty(value = "费用类型：0=租赁费；1=物业费；2=租赁押金；3=物业证金；4=水电费；5=杂项费；6=其他 ", example = "1")
			@ExcelColumn(name="费用类型",index = 8,width = 6,valueMapping = "0=租赁费；1=物业费；2=租赁押金；3=物业证金；4=水电费；5=杂项费；6=其他;")
			@ApiModelProperty(value = "费用类型：0=租赁费；1=物业费；2=租赁押金；3=物业押金；4=水电费；5=杂项费；6=其他; 7=保证金", example = "1")
			@ExcelColumn(name="费用类型",index = 8,width = 6,valueMapping = "0=租赁费；1=物业费；2=租赁押金；3=物业押金;4=水电费;5=杂项费；6=其他;7=保证金;")
			private Integer costType;

			@ApiModelProperty(value = "账单类型：0=收款；1=付款", example = "1")
			@@ -107,6 +107,7 @@
			@ApiModelProperty(value = "付款状态：0=待收款；1=已结清；2=部分结清；3=待付款；4=待退款；5=已关闭")
			@ExcelColumn(name="结清状态",index = 3,width = 6,valueMapping = "0=待收款;1=已结清;2=部分结清;3=待付款;4=待退款;5=已关闭;")
			private Integer payStatus;

			@ApiModelProperty(value = "退租类型 0到期退租 1换房退租 2违约退租 3协商退租", example = "1")
			@ExcelColumn(name="退租类型 0到期退租 1换房退租 2违约退租 3协商退租")
			private Integer btType;
			@@ -162,11 +163,6 @@
			@TableField(exist = false)
			private String roomPathName;

			@ApiModelProperty(value = "房间数据", example = "1")
			@TableField(exist = false)
			private List<YwRoom> ywRoomList ;


			@ApiModelProperty(value = "计划付款日 - 开始")
			@TableField(exist = false)
			@JsonFormat(pattern = "yyyy-MM-dd")
			@@ -191,7 +187,7 @@
			@ApiModelProperty(value = "是否逾期：0=否；1=是")
			@TableField(exist = false)
			@ExcelColumn(name="是否逾期",index = 9,width = 6,valueMapping = "0=未逾期；1=已逾期")
			private BigDecimal isOverdue;
			private Integer isOverdue;

			@ApiModelProperty(value = "附件信息", example = "1")
			@TableField(exist = false)