Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 e1fd9c69d375b691d83d08f3411124bc3a051a00

 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;