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

huanghongfa

2021-09-16 a824e3b0f4b9f2f1d45f7195eb1fec2a6f5ba2a9

 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;

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