Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 22342c6e9a1dd8cbc129cb083cc13d16a8322195

 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.需求清单）
     */