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

liyong

8 天以前 473d21a70284f793e8042eb618e2b1ffceb11a66

 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;

/**