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

liding

2026-03-16 3322c20909d2cc762b9a7a4a4c8b2bb728ebebd9

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

@@ -64,6 +64,6 @@
    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty("净重")
    private BigDecimal netWeight;
    @ApiModelProperty("产品id")
    private Long productId;
}