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