From 31d3591b34d4f26ad2ab207ca3044048d9adb9df Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 21 八月 2024 17:51:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml
index 0d6e2c9..962b43a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml
@@ -5,12 +5,12 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.PlatformVO">
<result column="platform_name" property="platformName" />
- <result column="platform_contact" property="platformContact" />
- <result column="platform_contact_phone" property="platformContactPhone" />
<result column="status" property="status" />
<result column="remark" property="remark" />
+ <result column="area" property="area" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
+ <result column="sub_platform_name" property="subPlatformName" />
</resultMap>
@@ -22,10 +22,10 @@
<select id="getById" resultMap="BaseResultMap">
SELECT
TP.platform_name,
- TP.platform_contact,
- TP.platform_contact_phone,
+ TP.platform_ip,
TP.status,
TP.remark,
+ TP.area,
TP.create_time,
TP.update_time,
TP.id
@@ -39,13 +39,15 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT
TP.platform_name,
- TP.platform_contact,
- TP.platform_contact_phone,
+ TP.platform_ip,
TP.status,
+ TP.area,
TP.remark,
TP.create_time,
TP.update_time,
- TP.id
+ TP.id,
+ TP.parent_id,
+ TP.sub_platform_name
FROM
t_platform TP
WHERE
--
Gitblit v1.8.0