Merge remote-tracking branch 'origin/dev' into dev

huanghongfa

2022-03-07 bf71f1fd72fa08204b67bd14a656890015b75247

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

@@ -243,4 +243,8 @@
     */
    private Integer activityTime;

    /**
     * 单次活动时长（小时）
     */
    private Integer duration;
}