Merge branch 'dev' into pre-production

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml

@@ -53,6 +53,7 @@
 
         select pickup_batch,
                warehouse,
+               warehouse_id,
                consignee_unit,
                waybill_number,
                order_code,
@@ -72,6 +73,7 @@
             examine_user
         from (select dbl.pickup_batch,
             dsa.warehouse,
+            dsa.warehouse_id,
             dsa.consignee_unit,
             dsa.waybill_number,
             dsa.order_code,
@@ -120,7 +122,7 @@
                forklift_fee,
                add_value_fee,
                amountToFee,
-               createdTime
+               createdTime create_time
         from (select obj.pickup_batch,
                      lww.name       as            warehouse,
                      lww.id       as            warehouse_id,

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml

@@ -719,8 +719,8 @@
                        LEFT JOIN logpm_distribution_parcel_list ldpl ON ldsa.id = ldpl.stock_article_id
                        LEFT JOIN logpm_warehouse_tray_goods lwtg ON lwtg.association_id = ldpl.id
                        LEFT JOIN logpm_warehouse_updown_goods lwug ON lwug.association_id = ldpl.id
-                  ${ew.customSqlSegment}
               group by ldsa.id) t
+                  ${ew.customSqlSegment}
     </select>
     <select id="getDetailsZeroPageCount" resultType="java.lang.Long">
         select count(*) from (