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

maven

6 天以前 b1b59aac99c3d465d51e5fb4f7ab8185ddb733d2

 src/main/java/com/ruoyi/common/vo/FileVo.java

@@ -29,5 +29,5 @@
    @ApiModelProperty(value = "修改用户")
    private Integer updateUser;

    private Integer id;
    private Long id;
}