Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

昨天 cebef271a105494b4e4e5c09f2d12636d620304c

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

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

    private Integer id;
    private Long id;
}