Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
f9080bb812
|
|
@ -1313,7 +1313,6 @@ public class OrderMasterController extends BaseController {
|
||||||
orderListResponse.setProvinceId(orderMaster.getProvinceId());
|
orderListResponse.setProvinceId(orderMaster.getProvinceId());
|
||||||
orderListResponse.setCityId(orderMaster.getCityId());
|
orderListResponse.setCityId(orderMaster.getCityId());
|
||||||
orderListResponse.setCountryId(orderMaster.getCountryId());
|
orderListResponse.setCountryId(orderMaster.getCountryId());
|
||||||
orderListResponse.setAddress(orderMaster.getAddress());
|
|
||||||
orderListResponse.setPhone(orderMaster.getPhone());
|
orderListResponse.setPhone(orderMaster.getPhone());
|
||||||
orderListResponse.setName(orderMaster.getName());
|
orderListResponse.setName(orderMaster.getName());
|
||||||
orderListResponse.setProvinceName(orderMaster.getProvinceName());
|
orderListResponse.setProvinceName(orderMaster.getProvinceName());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue