Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

9 天以前 b5f0127bd07d590b262169af5ea1b958fc707265

 src/main/java/com/ruoyi/common/vo/SimpleFileVo.java

@@ -5,7 +5,7 @@
import lombok.Data;
import lombok.NoArgsConstructor;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import java.io.Serializable;

/**