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

CeDo

2021-05-12 54119765bb38d7a18a833fd67433e52969e729c0

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

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

@@ -115,7 +115,6 @@
    @ApiModelProperty("修改时间")
    private Date updateAt;


    @ApiModelProperty("籍贯")
    private String nativePlace;

@@ -138,18 +137,21 @@
    @NotBlank(groups = {AddGroup.class},message = "是否租住不可为空")
    private Integer isRent;


    @ApiModelProperty("文化程度")
    private String cultureLevel;


    @ApiModelProperty("婚姻状况")
    private String marriage;


    @ApiModelProperty("健康状况")
    private String healthy;

    @ApiModelProperty("外地or本地（1.本地  2.外地）")
    private Integer outOrLocal;

    @ApiModelProperty("户口所在地")
    private String censusRegister;

    public interface sex{
        int nan = 1;
        int nv = 2;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -176,7 +176,11 @@
        IPage<ComMngPopulationVO> iPage = populationDAO.pagePopulation(page, comMngPopulationVO);
        iPage.getRecords().forEach(vo->{
            //获取用户生日
            String birthday = vo.getCardNo().substring(6, 14);
            String date = vo.getCardNo().substring(6, 14);
            String year = date.substring(0,4);
            String month = date.substring(4,6);
            String day = date.substring(6,8);
            String birthday = year + "-" + month + "-" + day;
            //设置用户年龄
            vo.setBirthday(birthday);
        });