From ad61b2a84ee5b2debc8b2bd0981c3f127180787e Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 3 Aug 2023 17:24:14 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=BF=90=E8=90=A5=E5=95=86=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/pile/domain/PileMerchantInfo.java | 10 +++++++++
 .../mapper/pile/PileMerchantInfoMapper.xml    | 22 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileMerchantInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileMerchantInfo.java
index 4695a8d06..377b4eeed 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileMerchantInfo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileMerchantInfo.java
@@ -27,6 +27,16 @@ public class PileMerchantInfo extends BaseEntity {
 	@Excel(name = "运营商名称")
 	private String merchantName;
 
+	/**
+	 * 运营商等级（1-一级运营商；2-二级运营商）
+	 */
+	private String merchantLevel;
+
+	/**
+	 * 父级运营商id
+	 */
+	private String parentId;
+
 	/**
 	 * 地址
 	 */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
index 9329eaa7b..fcf500221 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
@@ -6,6 +6,8 @@
     <resultMap type="com.jsowell.pile.domain.PileMerchantInfo" id="PileMerchantInfoResult">
         <result property="id" column="id"/>
         <result property="merchantName" column="merchant_name"/>
+        <result property="merchantLevel" column="merchant_level"/>
+        <result property="parentId" column="parent_id"/>
         <result property="address" column="address"/>
         <result property="status" column="status"/>
         <result property="organizationCode" column="organization_code"/>
@@ -25,6 +27,8 @@
     <sql id="Base_Column_List">
         id,
         merchant_name,
+        merchant_level,
+        parent_id,
         address,
         status,
         organization_code,
@@ -99,6 +103,12 @@
             <if test="merchantName != null">
                 merchant_name,
             </if>
+            <if test="merchantLevel != null">
+                merchant_level,
+            </if>
+            <if test="parentId != null">
+                parent_id,
+            </if>
             <if test="address != null">
                 address,
             </if>
@@ -149,6 +159,12 @@
             <if test="merchantName != null">
                 #{merchantName},
             </if>
+            <if test="merchantLevel != null">
+                #{merchantLevel},
+            </if>
+            <if test="parentId != null">
+                #{parentId},
+            </if>
             <if test="address != null">
                 #{address},
             </if>
@@ -200,6 +216,12 @@
             <if test="merchantName != null">
                 merchant_name = #{merchantName},
             </if>
+            <if test="merchantLevel != null">
+                merchant_level = #{merchantLevel},
+            </if>
+            <if test="parentId != null">
+                parent_id = #{parentId},
+            </if>
             <if test="address != null">
                 address = #{address},
             </if>