rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserService.java

@@ -393,7 +393,7 @@ public class UserService
         deviceUserVo.setUid(userVo.getId());
         deviceUserVo.setEid(userVo.getCode());
         deviceUserVo.setPassword(userVo.getPassword());
-        deviceUserVo.setName(userVo.getCityName() + userVo.getZoneName() + userVo.getName());
+        deviceUserVo.setName(userVo.getProvinceName() + userVo.getZoneName() + userVo.getName());
         deviceUserVo.setDeviceCode(deviceVo.getDeviceCode());
         deviceUserVo.setMerchantId(userVo.getMerchantId());
         deviceUserVo.setMerchantName(userVo.getMerchantName());

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

@@ -4,10 +4,13 @@ import lombok.Data;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.Date;
 
 @Data
 @ToString
 public class DeviceModelVo  implements Serializable
 {
     private String deviceModel;
+
+    private Date gmtCreated;
 }