Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

manailin

2021-06-23 687a0687ebad6cd1cfcb6a6017a99ec0458d1d1a

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -2070,7 +2070,7 @@
     */
    @Override
    public R getScreenEventList(ScreenEventListDTO eventListDTO) {
        if (!eventListDTO.getEventTypes().isEmpty()) {
        if (eventListDTO.getEventTypes() != null && !eventListDTO.getEventTypes().isEmpty()) {
            eventListDTO.getEventTypes().forEach(eventType -> {
                if(eventType.equals(ScreenEventListDTO.eventType.xc)){
                    eventListDTO.setEventCategory(null);