productDev/funingyunwei.git

			@@ -142,6 +142,18 @@
			@ApiModelProperty(value = "租赁条款押金（元）", example = "1")
			@ExcelColumn(name="租赁条款押金（元）")
			private BigDecimal zlDeposit;
			@ApiModelProperty(value = "首期租赁条款单价（元）", example = "1")
			@ExcelColumn(name="首期租赁条款单价（元）")
			private BigDecimal zlFirstPrice;
			@ApiModelProperty(value = "首期租赁条款价格单位", example = "1")
			@ExcelColumn(name="首期租赁条款价格单位")
			private Integer zlFirstCircle;
			@ApiModelProperty(value = "物业租赁条款单价（元）", example = "1")
			@ExcelColumn(name="物业租赁条款单价（元）")
			private BigDecimal wyFirstPrice;
			@ApiModelProperty(value = "物业租赁条款价格单位", example = "1")
			@ExcelColumn(name="物业租赁条款价格单位")
			private Integer wyFirstCircle;

			@ApiModelProperty(value = "租赁支付方式 0=一次性付款；1=每三个月一付；2=六个月一付；3=一年一付", example = "1")
			@ExcelColumn(name="租赁支付方式 0=一次性付款；1=每三个月一付；2=六个月一付；3=一年一付")
			@@ -232,7 +244,16 @@
			@ApiModelProperty(value = "退款未结清账单数")
			@TableField(exist = false)
			private int btWaitBill;
			@ApiModelProperty(value = "生成账单类型 0租赁账单 1物业账单")
			@TableField(exist = false)
			private int billType;

			@ApiModelProperty(value = "租赁租赁条款价格单位，概念名称", example = "1")
			@TableField(exist = false)
			private String zlFirstCircleStr;
			@ApiModelProperty(value = "物业租赁条款价格单位，概念名称", example = "1")
			@TableField(exist = false)
			private String wyFirstCircleStr;
			@ApiModelProperty(value = "退租时新增的收付款账单")
			@TableField(exist = false)
			private List<YwContractBill> addBillList;