From cf9fac40a8e39b25ee935a743224ae6c405bbddc Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 24 三月 2025 19:33:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs
---
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