Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml

@@ -893,7 +893,7 @@
         IFNULL(SUM(ldbls.quantity),0) AS 	actual_plan,
         IFNULL(SUM(ldbls.quantity),0) AS 	delivery,
         IFNULL(SUM(ldbls.quantity),0) AS 	sign,
-        (SELECT GROUP_CONCAT(site) FROM logpm_distribution_print WHERE bill_lading_id = ldbl.id GROUP BY bill_lading_id) AS image
+        IFNULL((SELECT GROUP_CONCAT(site) FROM logpm_distribution_print WHERE bill_lading_id = ldbl.id GROUP BY bill_lading_id),'无图片信息') AS image
         FROM
         logpm_distrilbution_bill_lading AS ldbl
         LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldbls.bill_lading_id = ldbl.id  AND ldbls.is_deleted = 0

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml

@@ -9,6 +9,7 @@
                 ${ew.sqlSegment}
             </if>
         </where>
+        order by create_time desc
     </select>
 
     <update id="cancel">