Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

Junjie

2023-11-27 5ac80d6a06f686a62c307c52c652e511e3896fb7

 src/main/java/com/zy/common/utils/YamlUtils.java

@@ -112,7 +112,8 @@
                String[] split = trim.split(":");
                String lineName = split[0];
                if (lineName.equals(name)) {
                    lines[idx] = line + " #" + dataResource.getMemo();
                    String[] split1 = line.split("#");
                    lines[idx] = split1[0] + " #" + dataResource.getMemo();
                }
                idx++;
            }
@@ -173,6 +174,9 @@
            }
        } else {
            String data = dataResource.getData();
            if (data == null) {
                data = "";
            }
            map.put(dataResource.getName(), data);
        }
    }