productDev/funingyunwei.git

			@@ -2,9 +2,8 @@

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.doumee.core.annotation.excel.ExcelColumn;
			import com.doumee.core.constants.OperaType;
			import com.doumee.core.model.LoginUserModel;
			import com.doumee.dao.business.vo.EditRecordDataVO;
			import com.doumee.dao.business.dto.EditRecordDataVO;
			import com.doumee.dao.system.model.Multifile;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			@@ -14,7 +13,6 @@
			import lombok.Data;
			import com.fasterxml.jackson.annotation.JsonFormat;

			import javax.validation.constraints.NotBlank;
			import java.util.Date;
			import java.math.BigDecimal;
			import java.util.List;
			@@ -38,7 +36,7 @@

			@ApiModelProperty(value = "创建时间")
			@ExcelColumn(name="创建日期",index = 8,width = 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date createDate;

			@ApiModelProperty(value = "更新人编码", example = "1")
			@@ -83,6 +81,9 @@
			@ApiModelProperty(value = "账单主键（关联yw_contract_bill）", example = "1")
			private Integer billId;

			@ApiModelProperty(value = "微信支付订单号")
			private String wxOrderNo;

			@ApiModelProperty(value = "收支类型：0=收入；1=支出", example = "1")
			@ExcelColumn(name="收支类型",index = 4,width = 10,valueMapping = "0=收入;1=支出")
			private Integer revenueType;
			@@ -92,20 +93,29 @@
			@ExcelColumn(name="合同编号",index = 1,width = 10)
			@TableField(exist = false)
			private String contractCode;


			@ApiModelProperty(value = "客户名称")
			@ApiModelProperty(value = "合同狀態", example = "1")
			@TableField(exist = false)
			private String customerNme;
			private String contractStatus;


			@ApiModelProperty(value = "客户名称（付款方）", example = "1")
			@ExcelColumn(name="客户名称",index = 0,width = 10)
			@TableField(exist = false)
			private String customerName;

			@ApiModelProperty(value = "流水账号")
			@TableField(exist = false)
			private String accountTitle;


			@ApiModelProperty(value = "账单类型", example = "1" , hidden = true)
			@TableField(exist = false)
			private Integer billType;


			@ApiModelProperty(value = "创建人名称")
			@ExcelColumn(name="创建人",index = 9,width = 10)
			@TableField(exist = false)
			private String realname;

			@ApiModelProperty(value = "关联房间数据", example = "1")