Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.

sxq

2021-06-11 56eba9cded865648465bc2c5815d47441e0457b1

 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