Merge remote-tracking branch 'origin/dev_New_pro' into dev_浪潮_pro

liyong

2026-05-12 a122cfc45d18b6e679029a88eb342e9081df6595

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

@@ -72,4 +72,6 @@
    @TableField(fill = FieldFill.INSERT)
    private Long deptId;

    @Schema(description = "是否锁定")
    private Boolean locked;
}