diff --git a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java
index d91d6d5..033ad59 100644
--- a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java
+++ b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java
@@ -6,7 +6,7 @@ public class UserVo {
 
 
         //用户id
-        private String userId;
+        private Long userId;
 
         //用户手机号
         private String phonenumber;
diff --git a/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java b/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java
index b188269..56414d5 100644
--- a/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java
+++ b/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java
@@ -115,6 +115,8 @@ public class SysLoginService
         recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
         Long userId = user.getUserId();
         R<UserVo> userVoR = remoteUserService.selectUserVo(userId);
+        userVoR.getData().setPhonenumber(user.getPhonenumber());
+        userVoR.getData().setUserId(userId);
         userInfo.setUserVo(userVoR.getData());
         return userInfo;
     }
diff --git a/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java b/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java
index ef431d2..739a381 100644
--- a/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java
+++ b/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java
@@ -67,6 +67,7 @@ public class TokenService
         Map<String, Object> rspMap = new HashMap<String, Object>();
         rspMap.put("access_token", JwtUtils.createToken(claimsMap));
         rspMap.put("expires_in", expireTime);
+        rspMap.put("user",loginUser.getUserVo());
         return rspMap;
     }
 
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
index 172133b..6f3c306 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
@@ -86,13 +86,13 @@ public class DevInfoServiceImpl implements IDevInfoService
 
             List<BaseAddress> addressList = devInfoMapper.getBaseAddress();
             for (BaseAddress address : addressList) {
-                if (String.valueOf(devInfoVo.getProvinceId()).equals(String.valueOf(address.getId()))) {
+                if (String.valueOf(devInfoVo.getProvinceId()).equals(String.valueOf(address.getCode()))) {
                     devInfoVo.setProvinceStr(address.getName());
                 }
-                if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getId()))) {
+                if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getCode()))) {
                     devInfoVo.setCityStr(address.getName());
                 }
-                if (String.valueOf(devInfoVo.getAreaId()).equals(String.valueOf(address.getId()))) {
+                if (String.valueOf(devInfoVo.getAreaId()).equals(String.valueOf(address.getCode()))) {
                     devInfoVo.setAreaStr(address.getName());
                 }
             }
@@ -186,7 +186,7 @@ public class DevInfoServiceImpl implements IDevInfoService
 //                if (String.valueOf(devInfoVo.getProvinceId()).equals(String.valueOf(address.getId()))) {
 //                    devInfoVo.setProvinceStr(address.getName());
 //                }
-                if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getId()))) {
+                if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getCode()))) {
                     devInfoVo.setCityStr(address.getName());
                 }
 //                if (String.valueOf(devInfoVo.getAreaId()).equals(String.valueOf(address.getId()))) {
diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java
index bcc7c5c..4caf79a 100644
--- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java
@@ -1,10 +1,13 @@
 package com.bonus.zlpt.order.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 import com.bonus.zlpt.common.core.domain.order.dto.FileInfoDto;
 import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo;
 import com.bonus.zlpt.common.core.utils.StringUtils;
+import com.bonus.zlpt.common.core.utils.uuid.UUID;
 import com.bonus.zlpt.common.security.utils.SecurityUtils;
 import com.bonus.zlpt.order.mapper.OrderDetailsMapper;
 import com.bonus.zlpt.system.api.model.LoginUser;
@@ -26,6 +29,7 @@ import javax.annotation.Resource;
 public class OrderInfoServiceImpl implements IOrderInfoService 
 {
     private final Integer ORDER_ATTACHMENT_DIC_ID = 21;
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     @Resource
     private OrderInfoMapper orderInfoMapper;
     @Resource
@@ -65,6 +69,8 @@ public class OrderInfoServiceImpl implements IOrderInfoService
     public int insertOrderInfo(OrderInfoVo orderInfo)
     {
         orderInfo.setOrderUser(SecurityUtils.getUserId());
+        orderInfo.setCode(UUID.randomUUID().toString());
+        orderInfo.setTime(dateFormat.format(new Date()));
         orderInfoMapper.insertOrderInfo(orderInfo);
         Long orderId = orderInfoMapper.selectLastInsertId();
         orderInfo.setOrderId(orderId);
diff --git a/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml b/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml
index ba5d764..9689440 100644
--- a/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
 	</select>
-	
+
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>