Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 bf46bac3cda70dc8dc7ed95e0461f1a72fba2eeb

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java

@@ -134,4 +134,10 @@
    private Integer belongType;
    private Long solveUnitId;

    private String activityName;

    private Long activityId;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date activityDate;

}