From 08b52ba6e8930958456ed58a1d39805caa7fe014 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Wed, 12 Jul 2023 20:24:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into dev
---
screen-manage/src/main/resources/mapper/DeviceMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/DeviceMapper.xml b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
index 178e9d0..28466d5 100644
--- a/screen-manage/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
@@ -67,8 +67,8 @@
<!--������������-->
<association property="town" javaType="java.util.HashMap">
- <result column="town_code" property="areaCode"/>
- <result column="town_name" property="name"/>
+ <result column="town_code" property="townCode"/>
+ <result column="town_name" property="townName"/>
</association>
<!--���������������-->
--
Gitblit v1.8.0