diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
index 03c11e76..9bd53852 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
@@ -65,7 +65,7 @@ public class PurchaseCheckInfo extends BaseEntity {
/** 物资厂家名称 */
@Excel(name = "物资厂家名称")
@ApiModelProperty(value = "物资厂家名称")
- private Long supplierName;
+ private String supplier;
/** 数据所属组织 */
@Excel(name = "数据所属组织")
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
index 2965a1bb..0559b875 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -40,11 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
pci.id, pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.supplier_id, pci.tax_rate, pci.create_by,
pci.create_time, pci.update_by, pci.update_time, pci.remark, pci.company_id,
- t.task_status, t.task_type, t.code, su.user_name as create_user_name
+ t.task_status, t.task_type, t.code, su.user_name as create_user_name, msi.supplier
from
purchase_check_info pci
left join tm_task t on t.task_id = pci.task_id
left join sys_user su ON pci.create_by = su.user_id
+ left join ma_supplier_info msi on pci.supplier_id = msi.supplier_id