Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-09 9576bebcacea938771f6f5b51d958e6a4ac59df6

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java

@@ -96,6 +96,10 @@
     */
    private Integer consultationVolume;
    /**
     * 浏览量
     */
    private Integer viewNum;
    /**
     * 是否删除
     */
    private Boolean isDel;