From c440a8f9a5a214cf05a029e6fe1af57f9b93dab2 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 20 Dec 2024 08:03:32 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/oms/domain/EmisRegion.java   | 17 ++++++++++++-----
 .../main/resources/mapper/EmisRegionMapper.xml  |  3 +--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisRegion.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisRegion.java
index d234b27..6fa0a0b 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisRegion.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisRegion.java
@@ -25,6 +25,7 @@ public class EmisRegion extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+
     /* id */
     private Long id;
     /* 代码 */
@@ -39,18 +40,24 @@ public class EmisRegion extends BaseEntity
     private String shortName;
     /* 父代码 */
     private String parentCode;
-    /* 所属片区id */
+    /* 所属派件片区id */
     private Long areaId;
-    /* 所属片区名称 */
-    private String areaName;
+    /* 所属寄件片区id */
+    private Long sendAreaId;
+
     /* 国家代码 */
     private String countryCode;
-    /* 国家名称 */
-    private String countryName;
+
     /* 邮编 */
     private String zipCode;
     /* 显示顺序 */
     private Integer orderNum;
 
 
+    //   附加信息
+    private String countryName;
+    private String areaName;
+    private String sendAreaName;
+
+
 }
diff --git a/emis-oms-biz/src/main/resources/mapper/EmisRegionMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisRegionMapper.xml
index 35f9304..84b3ca8 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisRegionMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisRegionMapper.xml
@@ -13,9 +13,8 @@
         <result property="shortName"    column="short_name"    />
         <result property="parentCode"    column="parent_code"    />
         <result property="areaId"    column="area_id"    />
-        <result property="areaName"    column="area_name"    />
+        <result property="sendAreaId"    column="send_area_id"    />
         <result property="countryCode"    column="country_code"    />
-
         <result property="zipCode"    column="zip_code"    />
         <result property="orderNum"    column="order_num"    />