fanli-server.git

			@@ -32,26 +32,34 @@
			@Column(name = "tmo_state")
			private String state;
			@Column(name = "tmo_jiesuan_time")
			private String jieSuanTime;
			private Date jieSuanTime;
			@Column(name = "tmo_weiquan_time")
			private String weiQuanTime;
			private Date weiQuanTime;
			@Column(name = "tmo_weiquan_finish_time")
			private String weiQuanFinishTime;
			private Date weiQuanFinishTime;
			@Column(name = "tmo_createtime")
			private Date createTime;// 创建时间
			@Column(name = "tmo_updatetime")
			private Date updateTime;// 本地更新时间

			@Column(name = "tmo_settlement")
			private BigDecimal settlement;// 结算金额
			@Transient
			private int mate; // 是否已匹配



			public Long getId() {
			return id;
			}

			public void setId(Long id) {
			this.id = id;
			}

			public BigDecimal getSettlement() {
			return settlement;
			}

			public void setSettlement(BigDecimal settlement) {
			this.settlement = settlement;
			}

			public Date getCreateTime() {
			@@ -118,27 +126,27 @@
			this.state = state;
			}

			public String getJieSuanTime() {
			public Date getJieSuanTime() {
			return jieSuanTime;
			}

			public void setJieSuanTime(String jieSuanTime) {
			public void setJieSuanTime(Date jieSuanTime) {
			this.jieSuanTime = jieSuanTime;
			}

			public String getWeiQuanTime() {
			public Date getWeiQuanTime() {
			return weiQuanTime;
			}

			public void setWeiQuanTime(String weiQuanTime) {
			public void setWeiQuanTime(Date weiQuanTime) {
			this.weiQuanTime = weiQuanTime;
			}

			public String getWeiQuanFinishTime() {
			public Date getWeiQuanFinishTime() {
			return weiQuanFinishTime;
			}

			public void setWeiQuanFinishTime(String weiQuanFinishTime) {
			public void setWeiQuanFinishTime(Date weiQuanFinishTime) {
			this.weiQuanFinishTime = weiQuanFinishTime;
			}