Merge branch 'test' into 'test_bak'

罗元桥

2021-10-18 2e2a241d0365acf73dfe17087f2541b1a1edb337

 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;

}