Merge remote-tracking branch 'origin/master'

许鹏程

2024-08-20 0e730e50ae1adcd416fb929b37f022e595d88d79

 src/main/java/com/product/administration/service/EarlyWarningServer.java

@@ -321,6 +321,7 @@
      while (s >= 0) {
         int c = warnContent.indexOf("{#", s);
         if (c == -1) {
            concatField.append(" uuid ");
            break;
         }
         int m = warnContent.indexOf("#}", c);