From 5ac80d6a06f686a62c307c52c652e511e3896fb7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 十一月 2023 16:44:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/java/com/zy/common/utils/YamlUtils.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/YamlUtils.java b/src/main/java/com/zy/common/utils/YamlUtils.java
index 218d4d2..9e2a425 100644
--- a/src/main/java/com/zy/common/utils/YamlUtils.java
+++ b/src/main/java/com/zy/common/utils/YamlUtils.java
@@ -174,6 +174,9 @@
}
} else {
String data = dataResource.getData();
+ if (data == null) {
+ data = "";
+ }
map.put(dataResource.getName(), data);
}
}
--
Gitblit v1.9.1