Merge branch 'acid_push' into huacheng_test

zhaozhengjie

2022-09-16 f4c8664c2d1c6d6e62f75433a27c5645942d5e85

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java

@@ -43,6 +43,8 @@
    @ApiModelProperty("预计服务时长")
    private String targetServiceTime;

    private String topicName;

    /**
     * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
     */