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

liyong

2 天以前 60806825951c111ac107dec87bd3acc5a7d6a707

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

@@ -63,4 +63,7 @@

    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty("净重")
    private BigDecimal netWeight;
}