Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

This commit is contained in:
leijun
2018-10-19 19:41:30 +08:00
23 changed files with 332 additions and 104 deletions

View File

@@ -23,14 +23,14 @@ public class IpPayloadTemplate extends IpAllTemplate {
public String getUserRegion2() {
return userRegion2;
}
public void setUserRegion2(String userRegion1) {
public void setUserRegion2(String userRegion2) {
this.userRegion2 = userRegion2;
}
@ExcelField(title="replace_content",align=2,sort=4)
public String getUserRegion3() {
return userRegion3;
}
public void setUserRegion3(String userRegion1) {
public void setUserRegion3(String userRegion3) {
this.userRegion3 = userRegion3;
}
}