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

CeDo

2021-06-16 177dd707939f7a8de597b1940725445a46cbdf77

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