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

test

See merge request !1705

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

@@ -197,7 +197,7 @@ public class MaterialController extends WebBaseController {
         String materialId = materialDTO.getMaterialId();
         String msg = this.checkEmoji(materialDTO.getMaterialContent()) ;
         if(null != msg) {
-            return this.fail(msg) ;
+          //  return this.fail(msg) ;
         }
         MaterialDTO dto = materialApiService.selectMaterialById(materialId);
         if (dto == null) {