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

test

See merge request !409

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

@@ -280,13 +280,13 @@ public class MaterialController extends WebBaseController {
             return null ;
         }
         String s = EmojiFilterUtil.filterEmoji(msg) ;
-        if(msg.equals(s)) {
+        if(!msg.equals(s)) {
             return "保存失败，不支持特殊表情字符" ;
         }
         return null ;
     }
     
     public static void main(String[] args) {
-        System.out.println(EmojiFilterUtil.filterEmoji("aasdsa查$%^&") );;
+        System.out.println(EmojiFilterUtil.filterEmoji("！@#~！@#￥%……&*&）（）——+——+{}“”：？》") );;
     }
 }