Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 00957f0c836b80d9052a6ccf673d3b454b646081

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

@@ -55,5 +55,8 @@
    @TableField("inventory_type")
    private Integer inventoryType;

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

}