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

101captain

2021-10-14 3ac9df9e72f1406cbfbd4c86b4d39d12f11b0701

 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;

}