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

101captain

2021-11-24 ce8e208c6d7752dec14e10e7e1c641c172072b06

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

@@ -240,7 +240,7 @@
     * 学历
     */
    @ApiModelProperty("学历")
    private Integer cultureLevel;
    private String cultureLevel;

    /**
     * 社区矫正人员编号