处理合并代码问题

Null

2021-03-17 8b13ca9086a609ef3bae76dab15faba55123d2dd

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

@@ -44,5 +44,7 @@
    private String status;
    @ApiModelProperty(value = "党员唯一标识id")
    private Long id;

    @ApiModelProperty(value = "报名时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;
}