no message
This commit is contained in:
parent
37722ef2fa
commit
ccb7cc34b5
|
|
@ -1320,7 +1320,7 @@ public class OrderMasterController extends BaseController {
|
||||||
orderListResponse.setCountryName(orderMaster.getCountryName());
|
orderListResponse.setCountryName(orderMaster.getCountryName());
|
||||||
orderListResponse.setStreetId(orderMaster.getStreetId());
|
orderListResponse.setStreetId(orderMaster.getStreetId());
|
||||||
orderListResponse.setStreetName(orderMaster.getStreetName());
|
orderListResponse.setStreetName(orderMaster.getStreetName());
|
||||||
orderListResponse.setAddress(orderMaster.getAddress());
|
orderListResponse.setAddress(orderMaster.getProvinceName()+orderMaster.getCityName()+orderMaster.getCountryName()+orderMaster.getStreetName()+orderMaster.getAddress());
|
||||||
}else{
|
}else{
|
||||||
if (!StringUtils.isEmpty(customerAddress.getStreetId()+"")){
|
if (!StringUtils.isEmpty(customerAddress.getStreetId()+"")){
|
||||||
String addressSysArea=sysArea.getMergerName();
|
String addressSysArea=sysArea.getMergerName();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue