Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 87c1e76403b09b137ad07abd75350a4b4cc23694

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmSupplierVO.java

@@ -11,7 +11,10 @@
@ApiModel(value = "TCrmSupplierVO对象", description = "crm供应商VO")
public class TCrmSupplierVO extends TCrmSupplier {

    @ApiModelProperty(value = "仓库id集合")
    private List<String> warehouseIds;
    @ApiModelProperty(value = "仓库id")
    private String warehouseId;

    @ApiModelProperty(value = "仓库名称")
    private String warehouseName;

}