clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2025-04-24 11:33:58 +08:00
parent 38b6211531
commit 368f943211
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -1308,17 +1308,17 @@ public class OrderMasterController extends BaseController {
orderListResponse.setIsCall(orderMaster.getIsCall()); orderListResponse.setIsCall(orderMaster.getIsCall());
orderListResponse.setAddress(orderMaster.getAddress()); orderListResponse.setAddress(orderMaster.getAddress());
orderListResponse.setProvinceId(customerAddress.getProvinceId()); orderListResponse.setProvinceId(orderMaster.getProvinceId());
orderListResponse.setCityId(customerAddress.getCityId()); orderListResponse.setCityId(orderMaster.getCityId());
orderListResponse.setCountryId(customerAddress.getCountryId()); orderListResponse.setCountryId(orderMaster.getCountryId());
orderListResponse.setAddress(customerAddress.getAddress()); orderListResponse.setAddress(orderMaster.getAddress());
orderListResponse.setPhone(customerAddress.getPhone()); orderListResponse.setPhone(orderMaster.getPhone());
orderListResponse.setName(customerAddress.getName()); orderListResponse.setName(orderMaster.getName());
orderListResponse.setProvinceName(customerAddress.getProvinceName()); orderListResponse.setProvinceName(orderMaster.getProvinceName());
orderListResponse.setCityName(customerAddress.getCityName()); orderListResponse.setCityName(orderMaster.getCityName());
orderListResponse.setCountryName(customerAddress.getCountryName()); orderListResponse.setCountryName(orderMaster.getCountryName());
orderListResponse.setStreetId(customerAddress.getStreetId()); orderListResponse.setStreetId(orderMaster.getStreetId());
orderListResponse.setStreetName(customerAddress.getStreetName()); orderListResponse.setStreetName(orderMaster.getStreetName());
return AjaxResult.success(orderListResponse); return AjaxResult.success(orderListResponse);
} catch (Exception e) { } catch (Exception e) {