Merge remote-tracking branch 'origin/master'

xuhy

2 天以前 092a98a583c4fe822a3eb4c4dac086f84b16189c

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

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

    private Integer type;


    @ApiModelProperty(value = "入库单号")
    @TableField("warehousing_no")
    private String warehousingNo;
    @TableField("warehouse_no")
    private String warehouseNo;



}