From ca8f5a8f133e7f5b00b9d35ff6d15720804569af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 31 一月 2024 10:15:32 +0800
Subject: [PATCH] Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs

---
 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