productDev/funingyunwei.git

			@@ -1,6 +1,8 @@
			package com.doumee.dao.business.model;

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.doumee.core.annotation.excel.ExcelColumn;
			import com.doumee.core.model.LoginUserModel;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import com.baomidou.mybatisplus.annotation.IdType;
			@@ -8,6 +10,8 @@
			import com.baomidou.mybatisplus.annotation.TableName;
			import lombok.Data;
			import com.fasterxml.jackson.annotation.JsonFormat;

			import java.math.BigDecimal;
			import java.util.Date;

			/**
			@@ -18,7 +22,7 @@
			@Data
			@ApiModel("运维合同房源关联信息表")
			@TableName("`yw_contract_room`")
			public class YwContractRoom {
			public class YwContractRoom extends LoginUserModel {

			@TableId(type = IdType.AUTO)
			@ApiModelProperty(value = "主键", example = "1")
			@@ -55,12 +59,31 @@
			@ExcelColumn(name="房源编码（关联yw_room)")
			private Integer roomId;

			@ApiModelProperty(value = "合同编码（关联yw_contract)", example = "1")
			@ExcelColumn(name="合同编码（关联yw_contract)")
			@ApiModelProperty(value = "合同编码或账单编码（关联yw_contract)", example = "1")
			@ExcelColumn(name="合同编码或账单编码（关联yw_contract)")
			private Integer contractId;

			@ApiModelProperty(value = "关联类型：0=合同；1=合同账单", example = "1")
			@ExcelColumn(name="关联类型：0=合同；1=合同账单")
			private Integer type;

			@ApiModelProperty(value = "排序码", example = "1")
			@ExcelColumn(name="排序码")
			private Integer sortnum;

			@ApiModelProperty(value = "项目名称")
			@TableField(exist = false)
			private String projectName;
			@ApiModelProperty(value = "楼宇名称")
			@TableField(exist = false)
			private String buildingName;
			@ApiModelProperty(value = "楼层名称")
			@TableField(exist = false)
			private String floorName;
			@ApiModelProperty(value = "房间名称")
			@TableField(exist = false)
			private String roomName;
			@ApiModelProperty(value = "建筑面积（平方米）", example = "1")
			@TableField(exist = false)
			private BigDecimal area;
			}