Merge branch 'master' into 'test'

罗yu 元桥

2021-04-28 b6082fe75b377ac9c177736d98f36ae46e7cdb70

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

@@ -64,6 +64,19 @@
    private String job;

    /**
     * 证件照（人像面）照片
     */
    private String cardPhotoFront;
    /**
     * 证件照（国徽面）照片
     */
    private String cardPhotoBack;
    /**
     * 户口本照片 逗号隔开
     */
    private String familyBook;

    /**
     * create_at
     */
    @TableField(fill = FieldFill.INSERT)