Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31

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

@@ -230,5 +230,9 @@
    private String supplierName;


    @ApiModelProperty(value = "诊所id")
    @TableField("clinic_ids")
    private String clinicIds;


}