data api entity add merchant

rankin-data-api/src/main/java/cn/rankin/data/api/app/dto/DeviceLoginDTO.java

@@ -10,4 +10,6 @@ import java.io.Serializable;
 public class DeviceLoginDTO implements Serializable{
 
     private String deviceCode;
+
+    private String merchant;
 }

rankin-data-api/src/main/java/cn/rankin/data/api/app/dto/LoginInfoDTO.java

@@ -14,6 +14,9 @@ public class LoginInfoDTO implements Serializable {
     private String deviceCode;
 
     @NotNull
+    private String merchant;
+
+    @NotNull
     private String eid;
 
     @NotNull

rankin-data-api/src/main/java/cn/rankin/data/api/app/vo/DeviceUserVo.java

@@ -1,7 +1,5 @@
 package cn.rankin.data.api.app.vo;
 
-import cn.rankin.common.utils.enums.GenderEnum;
-import cn.rankin.common.utils.util.SecurityUtil;
 import lombok.Data;
 import lombok.ToString;
 import java.io.Serializable;
@@ -17,6 +15,9 @@ public class DeviceUserVo implements Serializable {
     //设备信息
     private String deviceCode;
 
+    //渠道信息 simple
+    private String merchant;
+
     //用户信息
     private String eid;
 

rankin-data-api/src/main/java/cn/rankin/data/api/user/dto/TerminalDeviceDTO.java

@@ -16,6 +16,9 @@ public class TerminalDeviceDTO {
     private String deviceCode;
 
     @NotNull
+    private String merchant;
+
+    @NotNull
     private String userId;
 
     private String brand;

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/TerminalDevice.java

@@ -32,6 +32,9 @@ public class TerminalDevice implements Serializable {
 	@Column(name = "device_code")
 	private String deviceCode;
 
+	@Column(name = "merchant")
+	private String merchant;
+
 	@Column(name="user_id")
 	private String userId;
 

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/TerminalDeviceBindLog.java

@@ -24,6 +24,9 @@ public class TerminalDeviceBindLog implements Serializable {
     @Column(name = "device_code")
     private String deviceCode;
 
+    @Column(name = "merchant")
+    private String merchant;
+
     @Column(name="user_id")
     private String userId;
 

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/TerminalUser.java

@@ -54,6 +54,9 @@ public class TerminalUser implements Serializable {
     private String merchantName;
 
     @Transient
+    private String merchantSimple;
+
+    @Transient
     private String merchantContactName;
 
     @Transient

rankin-data-api/src/main/java/cn/rankin/data/api/user/vo/TerminalDeviceVo.java

@@ -22,6 +22,8 @@ public class TerminalDeviceVo implements Serializable {
 
     private String deviceCode;
 
+    private String merchant;
+
     private BaseStatusEnum status;
 
     private Date gmtCreated;

rankin-data-api/src/main/java/cn/rankin/data/api/user/vo/TerminalUserVo.java

@@ -33,6 +33,8 @@ public class TerminalUserVo implements Serializable {
 
     private String merchantName;
 
+    private String merchantSimple;
+
     private String merchantContactName;
 
     private String merchantContactMobile;