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

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -1782,7 +1782,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		List<String> keys = Collections.singletonList(key);
 		List<String> args = Arrays.asList(value, String.valueOf(expireTime));
 
-		Long result = redis.getRedisTemplate().execute(redisScript, keys, args);
+		Long result = redis.getStringRedisTemplate().execute(redisScript, keys, args);
 
 		if (result == 1) {
 			log.warn("#########orderScanOrderPackageCode: 托盘正在保存打托方式 trayCode={} warehouseId={}", trayCode, warehouseId);