Merge branch 'test' into 'master'

罗元桥

2021-08-11 929ff93a7a9db5b9fb0e3ce8e45a66ce59ea1767

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

@@ -157,6 +157,9 @@
    @ApiModelProperty("文化程度名称")
    private String cultureLevelName;

    @ApiModelProperty("职业")
    private String profession;

    @ApiModelProperty("婚姻状况(10.未婚 20.已婚 21.初婚 22.再婚 23.复婚 30.丧偶 40.离婚 90.未说明的婚姻状况 60.其他)")
    private Integer marriage;

@@ -190,6 +193,33 @@
    @ApiModelProperty("车辆列表")
    private List<ComMngPopulationCarVO> carList;

    @ApiModelProperty("吸毒信息")
    private ComDrugPopulationVO comDrugPopulationVO;

    @ApiModelProperty("社区矫正信息")
    private ComCorrectPopulationVO comCorrectPopulationVO;

    @ApiModelProperty("精神障碍信息")
    private ComMajorPopulationVO comMajorPopulationVO;

    @ApiModelProperty("邪教信息")
    private ComCultPopulationVO comCultPopulationVO;

    @ApiModelProperty("刑释信息")
    private ComRehabilitationPopulationVO comRehabilitationPopulationVO;

    @ApiModelProperty("上访信息")
    private ComKeyPopulationVO comKeyPopulationVO;

    @ApiModelProperty("退役军人信息")
    private ComVeteransPopulationVO comVeteransPopulationVO;

    @ApiModelProperty("残疾人信息")
    private ComDisabilityPopulationVO comDisabilityPopulationVO;

    @ApiModelProperty("低保户信息")
    private ComLowSecurityPopulationVO comLowSecurityPopulationVO;

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