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

101captain

2021-10-18 92ad195603db4b075d0ad1d7cf7471b15f2cc126

 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);
}