Merge branch 'test' into 'yuyue_dev'

罗元桥

2021-08-30 eda58e0e6d4abdd2b060e28867d103045845aa69

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java

@@ -23,6 +23,14 @@
    @ApiModelProperty(value = "是否是评论（1.是 2.否）")
    private Integer isComment;

    public AddComActIntegralUserDTO(Long serviceId, Integer integralType, Long communityId, Long userId) {
        this.serviceId = serviceId;
        this.integralType = integralType;
        this.communityId = communityId;
        this.userId = userId;
    }

    public AddComActIntegralUserDTO() {}

    /**
     * 积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷）
@@ -35,15 +43,5 @@
        int cysqhd = 5;
        int cydyhd = 6;
        int cydcwj = 7;
    }

    public AddComActIntegralUserDTO(Long serviceId, Integer integralType, Long communityId, Long userId) {
        this.serviceId = serviceId;
        this.integralType = integralType;
        this.communityId = communityId;
        this.userId = userId;
    }

    public AddComActIntegralUserDTO() {
    }
}