Merge remote-tracking branch 'origin/master'

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -32,6 +32,11 @@ public class SysUser extends BaseEntity {
     private Long userId;
 
     /**
+     * 云帆用户ID
+     */
+    private String yfUserId;
+
+    /**
      * 部门ID
      */
     @Excel(name = "部门编号", type = Type.IMPORT)
@@ -164,6 +169,14 @@ public class SysUser extends BaseEntity {
 
     }
 
+    public String getYfUserId() {
+        return yfUserId;
+    }
+
+    public void setYfUserId(String yfUserId) {
+        this.yfUserId = yfUserId;
+    }
+
     public SysUser(Long userId) {
         this.userId = userId;
     }