Merge branch 'dev-yhq' into develop

src/main/java/com/backendsys/modules/upload/controller/SysFileController.java

@@ -143,6 +143,7 @@ public class SysFileController {
         return Result.success().put("data", sysFileService.getUploadFileListByMd5(sysFile));
     }
 
+    @SysLog("合并重复 MD5 文件")
     @Operation(summary = "合并重复 MD5 文件")
     @PreAuthorize("@sr.hasPermission('1.1.4')")
     @PutMapping("/api/upload/mergeFileByMd5")

src/main/java/com/backendsys/modules/upload/entity/SysFile.java

@@ -65,7 +65,10 @@ public class SysFile {
     private String target_label;
     @TableField(exist = false)
     private Boolean is_exist;
+
+    // "上传时间" 只有 秒传 和 合并重复MD5 的时候会更新，"编辑" 的时候不变
     private String upload_time;
+
     private String create_time;
     private String update_time;
 }