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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 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;

    /**