Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev

lidongdong

2022-10-18 a411c58990bb7979fdde17ba8f0c3b20ae5cec85

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEventMapper.java

@@ -51,9 +51,9 @@
       */
   List<ComEvent> listByComEvent(@Param("comEvent") ComEvent comEvent,@Param("requestUserId") Long requestUserId);

    List<ComEventCalculateVO> calculate(ComEvent comEvent);
    List<ComEventCalculateVO> calculate(@Param("comEvent") ComEvent comEvent);

    int caculateSum(ComEvent comEvent);
    int caculateSum(@Param("comEvent")ComEvent comEvent);

    /**
     * 大屏事件统计