合并分支 'bug' 到 'master'

dev-misc/src/main/java/com/tykj/dev/misc/utils/MessageFormatUtil.java

 package com.tykj.dev.misc.utils;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * @author zjm
@@ -25,7 +26,7 @@ public class MessageFormatUtil {
         return "【" +
                 one +
                 "】" +
-                "-->" +
+                "至" +
                 "【" +
                 two +
                 "】";
@@ -48,4 +49,15 @@ public class MessageFormatUtil {
         return "";
     };
 
+
+    /**
+     * 阅知中拼接型号和数量
+     */
+    public static String spellUnitAndModelAndCount(String unitName, Set<String> models, Integer count) {
+        return "【"+unitName+"】【型号：" +
+                String.join(",",models) +
+                "共"+count+"件装备】";
+    }
+
+
 }