Merge branch 'test_screen' into 'master'

罗元桥

2021-06-16 927c7e1bf860078ca859cfd5ccd45475f8969105

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserElectronicFileVO.java

@@ -11,7 +11,7 @@
    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id",hidden = true)
    @ApiModelProperty(value = "用户id")
    private Long userId;

    /**