From d232680c92d2aee1c9b4c3807c37c2f82e46efa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 10 Mar 2020 21:41:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=8F=B8?=
 =?UTF-8?q?=E6=9C=BA=E7=9A=84=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/common/entity/MarkerUserInfo.java  | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java
index 6e8afdce87..98c3b35002 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java
@@ -17,7 +17,9 @@ public class MarkerUserInfo implements Serializable {
     private Integer age;// 年龄段，可以为空，与车聊聊一致
 
     // TODO V2X临时字段，接口出好后进行修改
-    private String userDrivingLevel;//用户驾驶级别，老司机、安全驾驶、危险驾驶
+    private String lastActiveweekAvgscore;//末次活跃周驾驶行为平均得分
+    private String safeLabel;//车辆安全标签
+    private int safeLabelType;//1老司机 2安全驾驶 3危险驾驶
 
     public void setAge(Integer age) {
         this.age = age;
@@ -153,12 +155,32 @@ public class MarkerUserInfo implements Serializable {
         this.userName = userName;
     }
 
-    public String getUserDrivingLevel() {
-        return userDrivingLevel;
+    public void setUserId(long userId) {
+        this.userId = userId;
     }
 
-    public void setUserDrivingLevel(String userDrivingLevel) {
-        this.userDrivingLevel = userDrivingLevel;
+    public String getLastActiveweekAvgscore() {
+        return lastActiveweekAvgscore;
+    }
+
+    public void setLastActiveweekAvgscore(String lastActiveweekAvgscore) {
+        this.lastActiveweekAvgscore = lastActiveweekAvgscore;
+    }
+
+    public String getSafeLabel() {
+        return safeLabel;
+    }
+
+    public void setSafeLabel(String safeLabel) {
+        this.safeLabel = safeLabel;
+    }
+
+    public int getSafeLabelType() {
+        return safeLabelType;
+    }
+
+    public void setSafeLabelType(int safeLabelType) {
+        this.safeLabelType = safeLabelType;
     }
 
     @Override
@@ -170,7 +192,9 @@ public class MarkerUserInfo implements Serializable {
                 ", userHead='" + userHead + '\'' +
                 ", gender='" + gender + '\'' +
                 ", age=" + age +
-                ", userDrivingLevel='" + userDrivingLevel + '\'' +
+                ", lastActiveweekAvgscore='" + lastActiveweekAvgscore + '\'' +
+                ", safeLabel='" + safeLabel + '\'' +
+                ", safeLabelType=" + safeLabelType +
                 '}';
     }
 }