Merge remote-tracking branch 'origin/master'

xuhy

2 天以前 87c1e76403b09b137ad07abd75350a4b4cc23694

 ruoyi-system/src/main/java/com/ruoyi/system/dto/TCrmSupplierDTO.java

@@ -14,7 +14,7 @@
    @ApiModelProperty(value = "密码")
    private String password;

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

}