From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java b/screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java
index e78948a..56a9557 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java
@@ -20,6 +20,6 @@
private Organization organization;
- private List<Group> groups;
+ private Group group;
}
--
Gitblit v1.8.0