Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-17 425501a2e9202068f980a63a1d20fdd637bb152c

 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;