jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 6 additions and 6 deletions

...	...	@@ -31,7 +31,7 @@
31	31	private String startCreated;
32	32	private String endCreated;
33	33	private String deathDateStart;
34		- private String endCreatedEnd;
	34	+ private String deathDatedEnd;
35	35
36	36	/**
37	37	* 居住地址省市区街道详细地址
38	38
...	...	@@ -98,12 +98,12 @@
98	98	this.deathDateStart = deathDateStart;
99	99	}
100	100
101		- public String getEndCreatedEnd() {
102		- return endCreatedEnd;
	101	+ public String getDeathDatedEnd() {
	102	+ return deathDatedEnd;
103	103	}
104	104
105		- public void setEndCreatedEnd(String endCreatedEnd) {
106		- this.endCreatedEnd = endCreatedEnd;
	105	+ public void setDeathDatedEnd(String deathDatedEnd) {
	106	+ this.deathDatedEnd = deathDatedEnd;
107	107	}
108	108
109	109	public String getLiveProvince() {

...	...	@@ -128,7 +128,7 @@
128	128
129	129	// 死亡时间
130	130	String deathDateStart = param.getDeathDateStart();
131		- String deathDateEnd = param.getDeathDateStart();
	131	+ String deathDateEnd = param.getDeathDatedEnd();
132	132	if (StringUtils.isNotEmpty(deathDateStart) && StringUtils.isNotEmpty(deathDateEnd)) {
133	133	Date startDate = DateUtil.parseYMD(deathDateStart);
134	134	Date dayFirstSecond = DateUtil.getDayFirstSecond(startDate);