Merge branch 'dev' into pre-production

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

@@ -984,7 +984,7 @@
         ldsld.id
     </select>
     <select id="getAllBillLadingByView" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingVO">
-        SELECT 	id,
+        SELECT id,
         orderCode,
         serviceNumber,
         consigneeUnit,
@@ -1020,7 +1020,7 @@
         GROUP_CONCAT( DISTINCT t.loadingUser ) AS loadingUser,
         GROUP_CONCAT( DISTINCT t.signUser ) AS signUser,
         GROUP_CONCAT( DISTINCT t.signOrderCode ) AS signOrderCode,
-        3 AS type,
+        4 AS type,
         #{userId} AS userId,
         #{nickName} AS nickName
         FROM