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

yaowanxin

3 天以前 a0fa5fa2d82f659a4b3e4a285a1f8603cc93ba86

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

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

    private Integer id;
    private Long id;
}