Merge branch 'dev_New_pro' into dev_New_pro_玉山机械

buhuazhen

2026-05-28 08553c034773008ba68b7b6709683b385610ee4f

 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;

/**