diff --git a/nex-be/src/main/java/com/unisinsight/project/entity/req/LoginReq.java b/nex-be/src/main/java/com/unisinsight/project/entity/req/LoginReq.java index 5d81906..6342522 100644 --- a/nex-be/src/main/java/com/unisinsight/project/entity/req/LoginReq.java +++ b/nex-be/src/main/java/com/unisinsight/project/entity/req/LoginReq.java @@ -31,6 +31,7 @@ public class LoginReq { private String token; @ApiModelProperty("mac地址") + @JsonProperty("mac_addr") private String macAddr; diff --git a/nex-be/src/main/java/com/unisinsight/project/service/impl/ClientServiceImpl.java b/nex-be/src/main/java/com/unisinsight/project/service/impl/ClientServiceImpl.java index f745739..eee6676 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/impl/ClientServiceImpl.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/impl/ClientServiceImpl.java @@ -63,7 +63,7 @@ public class ClientServiceImpl implements ClientService { HashMap map = new HashMap<>(); map.put("id",e.getId()); if (StringUtils.isNotBlank(e.getDesktopName())) { - map.put("name", e.getDesktopName()); + map.put("name", e.getDesktopName()+"."+e.getDesktopType()); } if (StringUtils.isNotBlank(e.getFileSize())) { map.put("file_size", e.getFileSize());