Merge branch 'hemenkou_dev' into dev

101captain

2022-02-25 9f69e3d2248902722c2a489ba9e14c3c24e4600d

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

@@ -55,4 +55,11 @@
     * @return
     */
    List<ConvenientViewStatisticsVO> selectSumForViewNum();

    /**
     * 获取商家总浏览量
     * @param merchantId
     * @return
     */
    int selectTotalViewNum(@Param("merchantId") Long merchantId);
}