diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisContinent.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisContinent.java
index fbb55d8c0..1ca00661f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisContinent.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisContinent.java
@@ -2,7 +2,7 @@
* @Project: emis
* @Title: EmisContinent.java
* @author linfso
- * @date 2023-12-12 06:35:06
+ * @date 2024-03-20 11:58:13
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description:
全球大区 实体类
@@ -17,6 +17,7 @@ import com.xdadan.erp.common.annotation.Excel;
import com.xdadan.erp.common.core.domain.BaseEntity;
import com.xdadan.erp.common.core.domain.TreeEntity;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
@@ -25,7 +26,7 @@ import lombok.Data;
* @ClassName EmisContinent
* @Description 全球大区
* @author linfso
- * @date 2023-12-12 06:35:06
+ * @date 2024-03-20 11:58:13
*/
@Data
public class EmisContinent extends BaseEntity
@@ -38,6 +39,8 @@ public class EmisContinent extends BaseEntity
private String name;
/* 英文名称 */
private String nameEn;
+ /* 显示顺序 */
+ private Integer orderNum;
/* 父ID */
private Integer parentId;
/* 洲代码(段码使用) */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java
index b5dfb5d61..e03a4f6ed 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java
@@ -2,7 +2,7 @@
* @Project: emis
* @Title: EmisCountry.java
* @author linfso
- * @date 2024-03-20 08:33:37
+ * @date 2024-03-20 11:55:22
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: 国家 实体类
@@ -26,7 +26,7 @@ import lombok.Data;
* @ClassName EmisCountry
* @Description 国家
* @author linfso
- * @date 2024-03-20 08:33:37
+ * @date 2024-03-20 11:55:22
*/
@Data
public class EmisCountry extends BaseEntity
@@ -39,10 +39,12 @@ public class EmisCountry extends BaseEntity
private String name;
/* 英文名称 */
private String nameEn;
- /* 国家代码 */
+ /* 国家编码 */
private String code;
/* 电话区号代码 */
private String telAreaCode;
+ /* iso代码 */
+ private String isoCode;
/* 所属洲id */
private Integer continentId;
/* 显示顺序 */
diff --git a/emis-biz/src/main/resources/mapper/EmisContinentMapper.xml b/emis-biz/src/main/resources/mapper/EmisContinentMapper.xml
index 530f5daaf..c35e839ec 100644
--- a/emis-biz/src/main/resources/mapper/EmisContinentMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisContinentMapper.xml
@@ -8,6 +8,7 @@
+
@@ -22,7 +23,7 @@
- select id, name, name_en, parent_id, code, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_continent
+ select id, name, name_en, order_num, parent_id, code, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_continent
@@ -58,6 +60,7 @@
id,
name,
name_en,
+ order_num,
parent_id,
code,
two_code,
@@ -74,6 +77,7 @@
#{id},
#{name},
#{nameEn},
+ #{orderNum},
#{parentId},
#{code},
#{twoCode},
@@ -93,6 +97,7 @@
name = #{name},
name_en = #{nameEn},
+ order_num = #{orderNum},
parent_id = #{parentId},
code = #{code},
two_code = #{twoCode},
diff --git a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
index 5ff994e06..9b5d16262 100644
--- a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
@@ -10,6 +10,7 @@
+
@@ -24,7 +25,7 @@
- select id, name, name_en, code, tel_area_code, continent_id, order_num, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_country
+ select id, name, name_en, code, tel_area_code, iso_code, continent_id, order_num, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_country
@@ -64,6 +66,7 @@
name_en,
code,
tel_area_code,
+ iso_code,
continent_id,
order_num,
two_code,
@@ -82,6 +85,7 @@
#{nameEn},
#{code},
#{telAreaCode},
+ #{isoCode},
#{continentId},
#{orderNum},
#{twoCode},
@@ -103,6 +107,7 @@
name_en = #{nameEn},
code = #{code},
tel_area_code = #{telAreaCode},
+ iso_code = #{isoCode},
continent_id = #{continentId},
order_num = #{orderNum},
two_code = #{twoCode},