jiangjiazhi / regional-platform

Authored by landong2015 over 8 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 6 additions and 6 deletions

...	...	@@ -351,7 +351,7 @@
351	351	result.setId(model.getId());
352	352	result.setUsername(model.getUsername());
353	353	result.setSex(model.getSex());
354		- result.setBirthDay(model.getBuildDay());
	354	+ result.setBirthday(model.getBirthday());
355	355	result.setCountryId(model.getCountryId());
356	356	result.setNationId(model.getNationId());
357	357	result.setMarriageId(model.getMarriageId());

...	...	@@ -17,7 +17,7 @@
17	17	//性别
18	18	private String sex;
19	19	//出生日期
20		- private String birthDay;
	20	+ private String birthday;
21	21	//国籍
22	22	private String countryId;
23	23	//民族Id
24	24
...	...	@@ -115,12 +115,12 @@
115	115	this.sex = sex;
116	116	}
117	117
118		- public String getBirthDay() {
119		- return birthDay;
	118	+ public String getBirthday() {
	119	+ return birthday;
120	120	}
121	121
122		- public void setBirthDay(String birthDay) {
123		- this.birthDay = birthDay;
	122	+ public void setBirthday(String birthday) {
	123	+ this.birthday = birthday;
124	124	}
125	125
126	126	public String getCountryId() {