Merge branch 'test_bak' into 'master'

罗元桥

2021-10-12 117e0945d9d7c94915c44e74c136d21a8fb17043

 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;