Merge branch 'test' into 'master'

罗元桥

2021-08-05 cc1098fc00a50cb1591d182f04bc37066ff0a9e2

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

@@ -111,6 +111,34 @@
     */
    private Integer lastViewsNum;

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

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

    /**
     * 发布状态(1.待审核 2.显示 3.隐藏 4.驳回)
     */
    public interface status{
        int dsh = 1;
        int xs = 2;
        int yc = 3;
        int bh = 4;
    }

    /**
     * 发布类型（1.小程序发布  2.后台发布）
     */
    public interface type{
        int mini = 1;
        int admin = 2;
    }

    @Override
    public String toString() {
        return "ComActNeighborCircleDO{" +