!6 同步develop分支

* sync -- 同步develop分支

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

@@ -1,5 +1,7 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,6 +23,7 @@ public class SysUserRole {
     /**
      * 用户ID
      */
+    @TableId(type = IdType.INPUT)
     @ApiModelProperty(value = "用户ID")
     private Long userId;