Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-08-13 6473d4d8be63f2d18db9a8f7c4b0096ee4dd6d55

 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java

@@ -14,7 +14,7 @@
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_config")
@TableName("sys_user_role")
public class SysUserRole {
    /**
     * 用户ID