Merge remote-tracking branch 'origin/dev_v1.0.1' into dev_v1.0.1

sop-business/src/main/resources/mapper/TBDeviceDeliveryMapper.xml

@@ -90,7 +90,7 @@
                 AND sd.model LIKE CONCAT('%',#{model},'%')
             </if>
             <if test="expressNo != null and expressNo != ''">
-                AND tbdd.express_no LIKE CONCAT('%',#{express_no},'%')
+                AND tbdd.express_no LIKE CONCAT('%',#{expressNo},'%')
             </if>
         </where>
         ORDER BY tbdd.update_time DESC
@@ -184,7 +184,7 @@
                 AND sd.model LIKE CONCAT('%',#{model},'%')
             </if>
             <if test="expressNo != null and expressNo != ''">
-                AND tbdd.express_no LIKE CONCAT('%',#{express_no},'%')
+                AND tbdd.express_no LIKE CONCAT('%',#{expressNo},'%')
             </if>
         </where>
         ORDER BY tbdd.update_time DESC