Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-18 a823bffa3800426d0a908b9397a8ea7586b5be21

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityDetailVO.java

@@ -1,6 +1,5 @@
package com.ruoyi.other.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;