Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/message/BaseServiceNewsService.java

@@ -279,7 +279,7 @@ public class BaseServiceNewsService {
                content = "发起了紧急救护";
                break;
            case "6":
                content = "发起了安防";
                content = "发起了安防监护";
                break;
            default:
                content = "";