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

gongchunyi

9 天以前 0907687e631c643a4cf0d41c1d2d4a645e69f0a7

 src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java

@@ -50,4 +50,7 @@
    private LocalDateTime weighingDate;

    private String  parentName;

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