Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-ma...

huminmin

昨天 c924d59a94fc17d570610cbf2b691481dd0b2e4d

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

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

    private Integer id;
    private Long id;
}