Merge remote-tracking branch 'origin/master'

boman-api/boman-domain/src/main/java/com/boman/domain/Czrk.java

@@ -76,7 +76,7 @@ public class Czrk extends BaseEntity{
     /**
      * 人员分类
      */
-    @Excel(name = "人员分类")
+    @Excel(name = "人员分类",readConverterExp = "changzhu=常住,wugong=务工,changzhu=出嫁,qiuxue=求学,qita,其他")
     private String keyIndustries;
 
     /**