Merge remote-tracking branch 'origin/master'

xuhy

5 天以前 11ecb9ee39fc61af04cd8d462faf9dce496d1773

 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java

@@ -58,6 +58,8 @@
    @TableField("total_price")
    private BigDecimal totalPrice;

    private Integer type;


    @ApiModelProperty(value = "入库单号")
    @TableField("warehouse_no")