From 8cb82432832795a55d8a72c73484517d110a7b00 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 27 八月 2021 18:15:48 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into shequhuodong

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java
index f5aaf05..f8417d0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java
+++ b/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;
 
     /**
      * 社区矫正人员编号

--
Gitblit v1.7.1