diff --git a/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/ToolExport.java b/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/ToolExport.java index 87dc6f3..a6fbb85 100644 --- a/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/ToolExport.java +++ b/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/ToolExport.java @@ -25,6 +25,10 @@ public class ToolExport { private String workNo; @Excel(name = "绑定用户") private String realName; + @Excel(name = "用户单位") + private String userOrgName; + @Excel(name = "用户部门") + private String userDeptName; @Excel(name = "绑定日期", format = "yyyy-MM-dd", width = 30) private Date bindDate; @Excel(name = "心率") diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java index 3627fb6..2930ef2 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java @@ -2214,6 +2214,8 @@ public class WatchDeviceServiceImpl extends ServiceImpl