From 06eb23476c809d54a705119d6cf7207bca03d2c8 Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Mon, 07 May 2018 22:02:35 +0800 Subject: [PATCH] test --- src/main/resources/mapper/DeviceMapper.xml | 2 +- src/main/java/com/moral/entity/Device.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java index 6490bc1..6d98dfc 100644 --- a/src/main/java/com/moral/entity/Device.java +++ b/src/main/java/com/moral/entity/Device.java @@ -117,8 +117,11 @@ private OperateUser operateUser; @Transient private DeviceVersion deviceVersion; - @Transient - private MonitorPoint monitorPoint; + //@Transient + //private MonitorPoint monitorPoint; @Transient private List<Integer> organizationIds; + + @Transient + private MonitorPoint monitorpointDetail; } \ No newline at end of file diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml index c7924aa..b86cb9d 100644 --- a/src/main/resources/mapper/DeviceMapper.xml +++ b/src/main/resources/mapper/DeviceMapper.xml @@ -24,7 +24,7 @@ <result column="device_version_value" property="version" jdbcType="INTEGER" /> <result column="device_version_name" property="name" jdbcType="VARCHAR" /> </association> - <association property="monitorPoint" javaType="com.moral.entity.MonitorPoint"> + <association property="monitorpointDetail" javaType="com.moral.entity.MonitorPoint"> <result column="monitor_point_id" property="id" jdbcType="INTEGER" /> <result column="monitor_point_name" property="name" jdbcType="VARCHAR" /> </association> -- Gitblit v1.8.0