Merge remote-tracking branch 'origin/master'

huanghongfa

2021-07-07 ad723be9b0bd0977619caf5ce31b91d04116c70e

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java

@@ -86,4 +86,8 @@
     * 业务主键 用于跳转
     */
    private Long businessId;
    /**
     * 社区活动类型 1志愿者活动 2居民活动
     */
    private Integer activityType;
}