Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-08 3e63a023f91a1cefbfb72f778bf410b06b021cb9

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

@@ -42,7 +42,7 @@
       * @author manailin
       * @date   2022-09-07 11:23:51
       */
   List<ComEvent> listByComEvent(@Param("comEvent") ComEvent comEvent);
   List<ComEvent> listByComEvent(@Param("comEvent") ComEvent comEvent,@Param("requestUserId") Long requestUserId);

    List<ComEventCalculateVO> calculate();