Merge branch 'zzj' into 'test'

罗元桥

2021-09-03 6cee6c4b10cb4bc97f8fb514bb1f55b66d1a84fa

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

@@ -121,6 +121,16 @@
     */
    private Integer type;

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

    /**
     * 是否已删除（1.是   2.否）
     */
    private Integer isDel;

    @Override
    public String toString() {
        return "ComActNeighborCircleDO{" + "id=" + id + ", releaseId=" + releaseId + ", releasePhone=" + releasePhone
@@ -147,4 +157,12 @@
        int mini = 1;
        int admin = 2;
    }

    /**
     * 是否已删除（1.是   2.否）
     */
    public interface isDel{
        int yes = 1;
        int no = 2;
    }
}