Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31

 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;

}