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

huanghongfa

2021-07-06 ac782f26335391de602d6033e29f936e6e7588b0

 springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/model/dto/ComMngPopulationDTO.java

@@ -116,6 +116,10 @@
     */
    private String nativePlace;
    /**
     * 民族code
     */
    private String nativeCode;
    /**
     * 民族
     */
    private String nation;
@@ -132,7 +136,7 @@
    /**
     * 文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)
     */
    private Integer cultureLevel;
    private String cultureLevel;

    /**
     * 婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)