From 97834eed504fa4d18bca16c24a4003f198ad6344 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 07 May 2018 22:05:48 +0800
Subject: [PATCH] test
---
src/main/resources/mapper/DeviceMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index b86cb9d..f9f17da 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -16,17 +16,17 @@
<result column="monitor_point_id" jdbcType="INTEGER" property="monitorPointId" />
<result column="device_version_id" jdbcType="INTEGER" property="deviceVersionId" />
<association property="operateUser" javaType="com.moral.entity.OperateUser">
- <result column="operate_user_id" property="id" jdbcType="INTEGER" />
- <result column="operate_user_name" property="name" jdbcType="VARCHAR" />
+ <result column="id" property="id" jdbcType="INTEGER" />
+ <result column="name" property="name" jdbcType="VARCHAR" />
</association>
<association property="deviceVersion" javaType="com.moral.entity.DeviceVersion">
- <result column="device_version_id" property="id" jdbcType="INTEGER" />
- <result column="device_version_value" property="version" jdbcType="INTEGER" />
- <result column="device_version_name" property="name" jdbcType="VARCHAR" />
+ <result column="id" property="id" jdbcType="INTEGER" />
+ <result column="version" property="version" jdbcType="INTEGER" />
+ <result column="name" property="name" jdbcType="VARCHAR" />
</association>
<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" />
+ <result column="id" property="id" jdbcType="INTEGER" />
+ <result column="name" property="name" jdbcType="VARCHAR" />
</association>
</resultMap>
<sql id="Example_Where_Clause">
--
Gitblit v1.8.0