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

疯狂的狮子li

2021-07-08 e30079d65629bd97b06c9442f6f0d58df5ac84dd

 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