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

huanghongfa

2021-08-04 25b3f5f6478bae1c0c063cb5a9e47b3eef5d0052

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultExcelVO.java

@@ -17,6 +17,9 @@
@EncryptDecryptClass
public class ComMngPopulationCultExcelVO implements Serializable {

    @ExcelProperty(value = "序号", index = 0)
    private String serialNumber;

    @ExcelProperty(value = "姓名", index = 1)
    private String name;

@@ -108,4 +111,9 @@
    private List<String> userTagStr = Lists.newArrayList();

    private Long houseId;

    /**
     * 出生年月日
     */
    private String address;
}