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

liding

5 天以前 1d915922d8197aa5d5dc3e40e3088d983dd6e141

 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;
}