ERP_override.git

			@@ -93,13 +93,14 @@
			<result column="create_time" property="deliveryDetail.createTime"/>
			<result column="dd_quantity" property="deliveryDetail.quantity"/>
			<result column="box_no" property="deliveryDetail.boxNo"/>
			<result column="area" property="deliveryDetail.area"/>

			<result column="project" property="order.project"/>

			<result column="creator" property="delivery.creator"/>
			<result column="customer_name" property="delivery.customerName"/>
			<result column="d_quantity" property="delivery.quantity"/>
			<result column="area" property="delivery.area"/>



			</resultMap>
			@@ -410,7 +411,7 @@
			dd.quantity as dd_quantity,
			od.warehouse_num,
			od.delivery_num,
			d.area,
			dd.area,
			od.building_number,
			d.creator,
			dd.delivery_detail_remakes,
			@@ -1120,7 +1121,7 @@
			dd.quantity as dd_quantity,
			od.warehouse_num,
			od.delivery_num,
			d.area,
			dd.area,
			od.building_number,
			d.creator,
			dd.delivery_detail_remakes,