Merge remote-tracking branch 'origin/master'

xuhy

6 天以前 79c1cc71dfcf2ac2a96433439507e582b7bf23e2

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

@@ -38,7 +38,7 @@

    @ApiModelProperty(value = "商品来源 1=平台添加 2=线下添加")
    @TableField("goods_source")
    private String goodsSource;
    private Integer goodsSource;

    @ApiModelProperty(value = "商品名称")
    @TableField("goods_name")