Merge remote-tracking branch 'origin/master'

xuhy

6 天以前 11ecb9ee39fc61af04cd8d462faf9dce496d1773

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

@@ -31,7 +31,7 @@

    @ApiModelProperty(value = "后台用户id")
    @TableField("user_id")
    private Integer userId;
    private Long userId;

    @ApiModelProperty(value = "供应商名称")
    @TableField("supplier_name")