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

huanghongfa

2021-09-30 fe609c99cd295ac64aa76e31eee4ae21bb167302

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComActFourMember.java

@@ -69,4 +69,6 @@

    private String password;

    private String idCard;

}