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

gongchunyi

22 小时以前 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 src/main/java/com/ruoyi/other/pojo/TempFile.java

@@ -16,5 +16,5 @@
    private String originalName;   // 原始文件名
    private String tempPath;       // 临时存储路径
    private LocalDateTime expireTime; // 过期时间
    private String type;       // 关联表类型
    private Integer type;       // 关联表类型
}