Merge remote-tracking branch 'origin/dev' into dev

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

@@ -549,15 +549,8 @@
                      case when review_time is null then '未复核' else '已复核' end signing_status,
                      review_time                                                   signing_time,
                      sign_num                                                      sign_num,
-                     case
+        sign_type                 sign_type,
-                         when sign_type = 1 then '司机扫描签收'
+        load_type                    loading_mode,
-                         when sign_type = 2 then '司机批量签收'
-                         when sign_type = 1 then '文员批量签收' end                sign_type,
-                     case
-                         when load_type = 2 then '按件装车'
-                         when load_type = 3 then '按订单装车'
-                         when load_type = 4 then '一键装车'
-                         when load_type = 5 then '补录装车' end                    loading_mode,
                      brand_name                                                    brand,
                      review_user_name                                              examine_user_name,
                      case