Merge branch 'test_bak' into 'master'

罗元桥

2021-09-27 d7a8baeff8b0e68c54a959e5f46f639c54aad1d1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbDynUserVO.java

@@ -1,10 +1,10 @@
package com.panzhihua.common.model.vos.partybuilding;

import java.util.Date;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -17,13 +17,13 @@
public class ComPbDynUserVO {

    @ApiModelProperty("id")
    private Integer id;
    private Long id;

    @ApiModelProperty("党员动态、政策文件id")
    private Integer dynId;
    private Long dynId;

    @ApiModelProperty("小程序用户id")
    private Integer userId;
    private Long userId;

    @ApiModelProperty("阅读时间")
    private Date createAt;