Merge branch 'local_20221014' into haucheng_panzhihua

yanghui

2022-10-22 74118d12bd9996846e7d0a05f95ea8e2d4ac24c1

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/test/java/com/panzhihua/service_community/service/impl/ComEventServiceImplTest.java

@@ -46,8 +46,8 @@
        ComEvent comEvent=new ComEvent();
     //   comEvent.setCreateBy(1l);
        comEvent.setKeyword("17345059081");
        R data = comEventService.pageByComEvent(comEvent, pagination);
        log.info(JSONObject.toJSONString(data));
//        R data = comEventService.pageByComEvent(comEvent, pagination);
//        log.info(JSONObject.toJSONString(data));
    }

    @Test
@@ -96,8 +96,8 @@

    @Test
    void calculate() {
        R data = comEventService.calculate();
        log.info(JSONObject.toJSONString(data));
//        R data = comEventService.calculate();
//        log.info(JSONObject.toJSONString(data));
    }

    @Test