Merge branch 'zzj' into 'test'

罗元桥

2021-09-03 6cee6c4b10cb4bc97f8fb514bb1f55b66d1a84fa

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

@@ -52,6 +52,24 @@
     */
    private Long createBy;

    /**
     * 热度
     */
    private Long hotNum;

    /**
     * 邻里圈数量
     */
    private Integer count;

    /**
     * 状态（1.启用  2.禁用）
     */
    public interface status{
        int yes = 1;
        int no = 2;
    }

    @Override
    public String toString() {
        return "ComActNeighborCircleTopicDO{" + "id=" + id + ", name=" + name + ", status=" + status + ", createAt="