diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java index 3e31264..7051b9d 100644 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java @@ -36,6 +36,10 @@ public class OrderDetails extends BaseEntity @Excel(name = "是否需要机手") private String isMachinist; + /** 详细地址 */ + @Excel(name = "设备进场省市县") + private Integer addressId; + /** 详细地址 */ @Excel(name = "详细地址") private String address; diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml index 4579610..cc88909 100644 --- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml +++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml @@ -29,7 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, order_id, need_company, plan_start_time, is_machinist, address, duration, invoice_type, description, ma_id, lease_type, lease_price, machinist_price, order_contract, machinist_name, phone, logistics_phone, real_start_time, renter_name, tenant_name, entry_attachment from ma_order_details + select id, order_id, need_company, plan_start_time, is_machinist, address_id, address, duration, invoice_type, + description, ma_id, lease_type, lease_price, machinist_price, order_contract, machinist_name, + phone, logistics_phone, real_start_time, renter_name, tenant_name, entry_attachment from ma_order_details