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

huanghongfa

2021-05-10 8ea04b4ee0f28a49775f486c34f81054adb56380

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

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

@@ -20,7 +20,7 @@
    private String name;
    @ApiModelProperty(value = "身份证")
    private String idCard;
    @JsonFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @ApiModelProperty(value = "入党时间")
    private Date joinTime;
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UpdateUserArchivesVO.java

@@ -22,4 +22,7 @@

    @ApiModelProperty("户口本照片 逗号隔开")
    private String familyBook;

    @ApiModelProperty("职业")
    private String job;
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -353,6 +353,7 @@
            " card_photo_front = #{userArchivesVO.cardPhotoFront} \n" +
            ", card_photo_back = #{userArchivesVO.cardPhotoBack} \n" +
            ",family_book = #{userArchivesVO.familyBook} \n" +
            ",job = #{userArchivesVO.job} \n" +
            " where user_id = #{userArchivesVO.userId}")
    void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO);