Merge remote-tracking branch 'origin/master'

master
kanade 3 years ago
commit 85eb4b794d

@ -65,7 +65,7 @@ public class ReferenceController {
@Schema(title = "素材分组id",description = "0为未分组") @Schema(title = "素材分组id",description = "0为未分组")
private Integer groupId; private Integer groupId;
@Schema(title = "文件地址列表") @Schema(title = "文件地址列表")
@NotNull(message = "fileUrl不能为空") @NotNull(message = "fileUrl列表不能为空")
private List<String> fileUrlList; private List<String> fileUrlList;
@Schema(title = "封面图片地址",description = "视频文件请上传封面图片") @Schema(title = "封面图片地址",description = "视频文件请上传封面图片")
private String coverUrl; private String coverUrl;

@ -32,6 +32,10 @@ public class RankServiceImpl implements IRankService {
cal.setTime(new Date()); cal.setTime(new Date());
cal.add(Calendar.MONTH,-1); cal.add(Calendar.MONTH,-1);
cal.set(Calendar.DAY_OF_MONTH,1); cal.set(Calendar.DAY_OF_MONTH,1);
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND,0);
Date time = cal.getTime(); Date time = cal.getTime();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd 00:00:00"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
try { try {

Loading…
Cancel
Save