diff --git a/coolstore-partner-dao/src/main/resources/mapper/OrderSysInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OrderSysInfoMapper.xml
index 63cd8c8a1..0cce6a722 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/OrderSysInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/OrderSysInfoMapper.xml
@@ -8,6 +8,7 @@
+
@@ -32,7 +33,7 @@
- id, shop_id, xgj_vice_president, xgj_region_id,addresseeName, addressee_mobile, addressee_province, addressee_city,
+ id, shop_id, xgj_vice_president, xgj_region_id,xgj_region_name,addresseeName, addressee_mobile, addressee_province, addressee_city,
addressee_district, addressee_address, declare_goods_logistics_warehouse, declare_goods_date,
warehouse_delivery_date, order_create_time, order_update_time, order_create_user, order_update_user,
receiving_firm_name, receiving_ms_bank_account, receiving_ms_bank_branch, bank_unionPay_account,
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/XgjOrganizationDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/XgjOrganizationDTO.java
new file mode 100644
index 000000000..5e45439fd
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/XgjOrganizationDTO.java
@@ -0,0 +1,118 @@
+package com.cool.store.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/11/13:38
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class XgjOrganizationDTO {
+ /**
+ * 主键ID
+ */
+ @ApiModelProperty(value = "主键ID", example = "1")
+ private String id;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间", example = "2023-12-12 16:15:23")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人", example = "张三")
+ private String createBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间", example = "2024-03-11 14:53:35")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人", example = "超级管理员")
+ private String updateBy;
+
+ /**
+ * 删除标志(0:未删除,1:已删除)
+ */
+ @ApiModelProperty(value = "删除标志(0:未删除,1:已删除)", example = "0")
+ private Integer deleted;
+
+ /**
+ * 父级ID
+ */
+ @ApiModelProperty(value = "父级ID", example = "0")
+ private String parentId;
+
+ /**
+ * 编码
+ */
+ @ApiModelProperty(value = "编码", example = "KH")
+ private String code;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称", example = "所有客户")
+ private String name;
+
+ /**
+ * 父级编码
+ */
+ @ApiModelProperty(value = "父级编码", example = "TOP")
+ private String parentCode;
+
+ /**
+ * 父级完整编码
+ */
+ @ApiModelProperty(value = "父级完整编码", example = "TOP.KH")
+ private String parentFullCode;
+
+ /**
+ * 开始时间
+ */
+ @ApiModelProperty(value = "开始时间", example = "2023-12-12 16:15:23")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ /**
+ * 结束时间
+ */
+ @ApiModelProperty(value = "结束时间", example = "2024-03-11 14:53:35")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ /**
+ * 状态(ENABLED:启用,DISABLED:禁用)
+ */
+ @ApiModelProperty(value = "状态(ENABLED:启用,DISABLED:禁用)", example = "ENABLED")
+ private String state;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注", example = "这是一个备注")
+ private String remark;
+
+ /**
+ * 系统标识
+ */
+ @ApiModelProperty(value = "系统标识", example = "XIONG")
+ private String sys;
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/OrderSysInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/OrderSysInfoDO.java
index 2ab85b918..6a8f76910 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/OrderSysInfoDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/OrderSysInfoDO.java
@@ -23,10 +23,13 @@ public class OrderSysInfoDO {
@Column(name = "xgj_vice_president")
private String xgjVicePresident;
- /** 新管家对应组织 */
+ /** 新管家对应组织id */
@Column(name = "xgj_region_id")
private String xgjRegionId;
+ /** 新管家对应组织name */
+ @Column(name = "xgj_region_name")
+ private String xgjRegionName;
/** 收件人 */
@Column(name = "addressee_name")
private String addresseeName;
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java
index 391b3f6d3..1e0e6eab7 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java
@@ -27,9 +27,12 @@ public class OrderSysInfoRequest {
@ApiModelProperty(value = "副总裁" )
private String xgjVicePresident;
- @ApiModelProperty(value = "新管家对应组织" )
+ @ApiModelProperty(value = "新管家对应组织id" )
private String xgjRegionId;
+ @ApiModelProperty(value = "新管家对应组织name" )
+ private String xgjRegionName;
+
@ApiModelProperty(value = "收件省" )
private String addresseeProvince;
@@ -92,6 +95,7 @@ public class OrderSysInfoRequest {
orderSysInfoDO.setShopId(this.shopId);
orderSysInfoDO.setXgjVicePresident(this.xgjVicePresident);
orderSysInfoDO.setXgjRegionId(this.xgjRegionId);
+ orderSysInfoDO.setXgjRegionName(this.xgjRegionName);
orderSysInfoDO.setAddresseeProvince(this.addresseeProvince);
orderSysInfoDO.setAddresseeCity(this.addresseeCity);
orderSysInfoDO.setAddresseeDistrict(this.addresseeDistrict);
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java
index 084a848ac..2730f0877 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java
@@ -121,8 +121,10 @@ public class BuildInformationResponse {
@ApiModelProperty(value = "副总裁" )
private String xgjVicePresident;
- @ApiModelProperty(value = "新管家对应组织" )
+ @ApiModelProperty(value = "新管家对应组织id" )
private String xgjRegionId;
+ @ApiModelProperty(value = "新管家对应组织name" )
+ private String xgjRegionName;
@ApiModelProperty(value = "收件省" )
private String addresseeProvince;