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

huanghongfa

2022-04-19 d89d4a28653657528dc0718f1aa55e1c84ad1e6f

 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;

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