Merge branch 'huacheng_test' into huacheng

101captain

2022-06-17 871972f549897b9cf3d9bd9da8ebfc897dc9fb1a

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

@@ -243,4 +243,12 @@
     * 单次活动时长（小时）
     */
    private Integer duration;

    private Integer isArticle;

    private String  jumpArticleUrl;

    private Long relationId;

    private String phone;
}