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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -112,6 +112,11 @@
    private Integer lastViewsNum;

    /**
     * 话题id
     */
    private Long topicId;

    /**
     * 发布类型（1.小程序发布  2.后台发布）
     */
    private Integer type;