Merge branch 'test' into 'test_screen'

罗元桥

2021-06-18 99ca25c5d2ee1e4d050f3aee96757bdfea195fc6

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

@@ -33,12 +33,12 @@
     * 入党日期
     */
    @ExcelProperty(value = "入党日期" ,index = 3)
    private Date joinTime;
    private String joinTime;
    /**
     * 转正日期
     */
    @ExcelProperty(value = "转正日期" ,index = 4)
    private Date employmentTime;
    private String employmentTime;
    /**
     * 所属社区
     */