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

huanghongfa

2021-09-18 15d3711a5321e9a5c38b66320ca6bff5b96a3b50

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

@@ -74,11 +74,11 @@
    /**
     * 是否养老登记（1.是  0.否）
     */
    private Integer isRegister;
    private Boolean isRegister;
    /**
     * 是否健在（1.是  0.否）
     */
    private Integer isAlive;
    private Boolean isAlive;
    /**
     * 居住地址
     */