Merge remote-tracking branch 'origin/master'

CeDo

2021-04-09 a4aa79a8fd9a40b34bac8ebb153f7ab1977282d3

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

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