处理冲突

2024年8月15日 17:31:26
This commit is contained in:
xiang2lin 2024-08-15 17:31:36 +08:00
parent b125e46f9b
commit 86d4bf5d53
1 changed files with 24 additions and 25 deletions

View File

@ -349,31 +349,6 @@ public class OerDjmlEntity extends BaseEntity {
public void setLclb(String lclb) { public void setLclb(String lclb) {
this.lclb = lclb; this.lclb = lclb;
} }
public List<GbiZbsyrecAllEntity> getGbiZbsyrecAllEntitylist() {
return gbiZbsyrecAllEntitylist;
}
public void setGbiZbsyrecAllEntitylist(List<GbiZbsyrecAllEntity> gbiZbsyrecAllEntitylist) {
this.gbiZbsyrecAllEntitylist = gbiZbsyrecAllEntitylist;
}
public List<OerDjnrAllEntity> getOerDjnrAllEntityList() {
return oerDjnrAllEntityList;
}
public void setOerDjnrAllEntityList(List<OerDjnrAllEntity> oerDjnrAllEntityList) {
this.oerDjnrAllEntityList = oerDjnrAllEntityList;
}
public List<OerYszbAllEntity> getOerYszbAllEntityList() {
return oerYszbAllEntityList;
}
public void setOerYszbAllEntityList(List<OerYszbAllEntity> oerYszbAllEntityList) {
this.oerYszbAllEntityList = oerYszbAllEntityList;
}
public String getXmdm() { public String getXmdm() {
return xmdm; return xmdm;
} }
@ -461,4 +436,28 @@ public class OerDjmlEntity extends BaseEntity {
public void setOerDjjsfsEntityList(List<OerDjjsfsEntity> oerDjjsfsEntityList) { public void setOerDjjsfsEntityList(List<OerDjjsfsEntity> oerDjjsfsEntityList) {
this.oerDjjsfsEntityList = oerDjjsfsEntityList; this.oerDjjsfsEntityList = oerDjjsfsEntityList;
} }
public List<GbiZbsyrecEntity> getGbiZbsyrecEntitylist() {
return gbiZbsyrecEntitylist;
}
public void setGbiZbsyrecEntitylist(List<GbiZbsyrecEntity> gbiZbsyrecEntitylist) {
this.gbiZbsyrecEntitylist = gbiZbsyrecEntitylist;
}
public List<OerDjnrEntity> getOerDjnrEntityList() {
return oerDjnrEntityList;
}
public void setOerDjnrEntityList(List<OerDjnrEntity> oerDjnrEntityList) {
this.oerDjnrEntityList = oerDjnrEntityList;
}
public List<OerYszbEntity> getOerYszbEntityList() {
return oerYszbEntityList;
}
public void setOerYszbEntityList(List<OerYszbEntity> oerYszbEntityList) {
this.oerYszbEntityList = oerYszbEntityList;
}
} }