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

huanghongfa

2021-05-08 b25706d1c853047b5ba1b822ea26466221d4e726

 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;
}