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

云

2026-04-22 f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1

 src/main/java/com/ruoyi/stock/pojo/StockInventory.java

@@ -10,7 +10,7 @@
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;

import javax.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotBlank;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;