Merge remote-tracking branch 'origin/master'

xuhy

昨天 092a98a583c4fe822a3eb4c4dac086f84b16189c

 ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsQuery.java

@@ -13,7 +13,7 @@
    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "商品标识码")
    @ApiModelProperty(value = "商品条码")
    private String goodsIdCode;

    @ApiModelProperty(value = "商品类型id")