From cb6aca0642ac8dd5de877ade168066d85acb589c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 17 十月 2025 15:54:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/FaceUserBean.java |   65 ++++++++++++--------------------
 1 files changed, 24 insertions(+), 41 deletions(-)

diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/FaceUserBean.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/FaceUserBean.java
index e962771..f102a58 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/FaceUserBean.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/FaceUserBean.java
@@ -1,65 +1,48 @@
 package com.doumee.keyCabinet.bean;
 
+import java.util.List;
+
 //浜鸿劯
 public class FaceUserBean {
-    private String id;
-    private String name;
-    private String faceUrl;
-    //0锛氫細鍛橈紝1锛氬鍛�
-    private String type;
-    private String editTime;
+    private String faceImg;
+    private String memberId;
+    private String memberName;
+
+    //0:绠$悊鍛橈紝1锛氱敤鎴�
+    private String groupId;
 
     private boolean checked;
 
-    public FaceUserBean() {
-
+    public String getFaceImg() {
+        return faceImg;
     }
 
-    public FaceUserBean(String id, String name, String type, String faceUrl) {
-        this.id = id;
-        this.name = name;
-        this.faceUrl = faceUrl;
-        this.type = type;
+    public void setFaceImg(String faceImg) {
+        this.faceImg = faceImg;
     }
 
-    public String getId() {
-        return id;
+    public String getMemberId() {
+        return memberId;
     }
 
-    public void setId(String id) {
-        this.id = id;
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
     }
 
-    public String getName() {
-        return name;
+    public String getGroupId() {
+        return groupId;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
     }
 
-    public String getFaceUrl() {
-        return faceUrl;
+    public String getMemberName() {
+        return memberName;
     }
 
-    public void setFaceUrl(String faceUrl) {
-        this.faceUrl = faceUrl;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getEditTime() {
-        return editTime;
-    }
-
-    public void setEditTime(String editTime) {
-        this.editTime = editTime;
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
     }
 
     public boolean isChecked() {

--
Gitblit v1.9.3