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

tangxiaobao

2021-09-15 1b9b482e6c55f043a586665b84d2d0feb8daa397

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java

@@ -77,7 +77,7 @@
    /**
     * 与监护人关系
     */
    private Integer custodyRelation;
    private String custodyRelation;

    /**
     * 监护人公民身份号码