Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-07-01 39b565ab0ea5e98a2bb0eb5c78b3c23247dbc2fe

 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml

@@ -927,7 +927,7 @@
               od.gross_amount,
               od.compute_gross_area,
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.remarks,"") as buildingNumber,
               ifnull(od.building_number,"") as buildingNumber,
               od.price
        from  order_detail od
        where  od.order_id = #{orderId}