Merge branch 'master_xgh_我的客户迭代' into 'developer'

test

See merge request !407

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/MaterialController.java

@@ -279,7 +279,8 @@ public class MaterialController extends WebBaseController {
         if(StringUtils.isBlank(msg)) {
             return null ;
         }
-        if(EmojiFilterUtil.containsEmoji(msg)) {
+        String s = EmojiFilterUtil.filterEmojiLast(msg) ;
+        if(!msg.equals(s)) {
             return "保存失败，不支持特殊表情字符" ;
         }
         return null ;