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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -369,7 +369,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        Integer statustemp = Integer.valueOf(assistanceDO.getStatus()+"");
        String statusName = "";
        switch (statustemp){
            case -2:statusName="误警报";break;
            case -2:statusName="已响应";break;
            case -1:statusName="已取消";break;
            case 0:statusName="已完成";break;
            case 1:statusName="预警中";break;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -356,7 +356,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        String statusName = "";
        switch (statustemp) {
            case -2:
                statusName = "误警报";
                statusName = "已响应";
                break;
            case -1:
                statusName = "已取消";