Merge remote-tracking branch 'origin/master'

xuhy

昨天 206fcf7d6afae27856f63cf0158f53b61fa1b86f

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

@@ -54,9 +54,9 @@
    @TableField("outbound_reason")
    private String outboundReason;

    @ApiModelProperty(value = "商品id")
    @TableField("goods_id")
    private String goodsId;
//    @ApiModelProperty(value = "商品id")
//    @TableField("goods_id")
//    private String goodsId;


}