From 83ccf770de4f2a7ea0debde1d411bf2085877104 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 21 Jul 2022 17:46:03 +0800
Subject: [PATCH] 活动底图

---
 src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml b/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
index 8b9d722..ca1b5cf 100644
--- a/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
+++ b/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
@@ -21,6 +21,7 @@
         <result column="pitch" property="pitch"/>
         <result column="roll" property="roll"/>
         <result column="panoramaurl" property="panoramaurl"/>
+        <result column="address_name" property="addressName"/>
     </resultMap>
 
 
@@ -66,7 +67,9 @@
                heading,
                pitch,
                roll,
-               panoramaurl
+               panoramaurl,
+               address_name,
+               x
         FROM `sys_architecture`
         WHERE id = #{id}
           and is_deleted = 0
@@ -80,13 +83,13 @@
           AND panoramaurl!='' and is_deleted = 0
     </select>
     <select id="selectArchALL" resultType="java.util.HashMap">
-        SELECT jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl
+        SELECT jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl,x
         FROM sys_architecture
         WHERE is_deleted = 0
-        UNION
-        SELECT jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl
-        FROM sys_mechanism
-        WHERE is_deleted = 0
+        --         UNION
+--         SELECT jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl
+--         FROM sys_mechanism
+--         WHERE is_deleted = 0
     </select>
 
     <select id="selectIns" resultType="java.lang.String">

--
Gitblit v1.9.3