Merge branch 'feature/xgh/bug/0415' into 'developer'

test

See merge request !1706

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

@@ -134,7 +134,7 @@ public class MaterialController extends WebBaseController {
         materialDTO.setStaffName(login.getClerkName());
         String msg = this.checkEmoji(materialDTO.getMaterialContent()) ;
         if(null != msg) {
-            return this.fail(msg) ;
+           // return this.fail(msg) ;
         }
         String materialTitle = materialDTO.getMaterialTitle();
         String categoryId = materialDTO.getCategoryId();