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

huanghongfa

2021-05-12 4c93d581de8323667e08bcb00dac88762a49e183

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

@@ -86,6 +86,14 @@
    @EncryptDecryptField
    private String phone;
    /**
     * 外地or本地
     */
    private String outOrLocal;
    /**
     * 户口所在地
     */
    private String censusRegister;
    /**
     * 备注
     */
    private String remark;