java/xizang.git

			@@ -16,6 +16,8 @@
			import lombok.Data;
			import lombok.EqualsAndHashCode;

			import javax.validation.constraints.NotBlank;

			/**
			* <p>
			* 合同管理
			@@ -87,7 +89,7 @@

			@ApiModelProperty(value = "押金是否随租金递增递减 true=是 false=否")
			@TableField("isIncreasing_deposit")
			private Boolean isincreasingDeposit;
			private Boolean isIncreasingDeposit;

			@ApiModelProperty(value = "违约金比例")
			@TableField("proportion")
			@@ -127,13 +129,24 @@

			@ApiModelProperty(value = "合同附件,多个逗号拼接")
			@TableField("contract_file")
			@NotBlank(message = "合同附件不能为空")
			private String contractFile;

			@ApiModelProperty(value = "备注")
			@TableField("remark")
			private String remark;

			@ApiModelProperty(value = "状态待提交待审批未签订已签订....")
			/**
			* 1 待提交
			* 2 待审批
			* 3 未签订
			* 4 已签订
			* 5 已驳回
			* 6 已终止
			* 7 待结算
			* 8 已结算
			*/
			@ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算 9 = 签订待审核")
			@TableField("status")
			private String status;
			@ApiModelProperty(value = "内存大小多个文件逗号拼接")
			@@ -151,5 +164,14 @@
			@ApiModelProperty(value = "合计年租金")
			@TableField("total_year")
			private BigDecimal totalYear;
			@ApiModelProperty(value = "房屋名称")
			@TableField(exist = false)
			private String houseName;
			@ApiModelProperty(value = "房屋地址")
			@TableField(exist = false)
			private String houseAddress;
			@ApiModelProperty(value = "审批流实例id")
			@TableField(exist = false)
			private String instanceId;

			}