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

liding

6 天以前 1284fb157043e488aa1794d8f1b64ebf18aa5147

 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;       // 关联表类型
}