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

liyong

4 天以前 80c45ea7934443bea5355bc6bace96ec23a58600

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