diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmStorageLog.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmStorageLog.java index 26b9f484..11a55b08 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmStorageLog.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmStorageLog.java @@ -66,7 +66,7 @@ public class BmStorageLog extends BaseEntity /** 退库接收-维修数量 */ @Excel(name = "退库接收-维修数量") @ApiModelProperty(value = "退库接收-维修数量") - private Long maintenanceNum; + private Long repairNum; /** 退库接收-报废数量 */ @Excel(name = "退库接收-报废数量") diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmStorageLogMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmStorageLogMapper.xml index 65a70de0..2f547be5 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmStorageLogMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmStorageLogMapper.xml @@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, model_title, method, type_id, pre_store_num, in_num, out_num, back_num, pass_num, maintenance_num, scrap_num, post_store_num, task_id, agreement_id, manage_type, type_name, type_model_name, result_code, result_msg, remark, status, json_result, creator, create_time, update_time from bm_storage_log + select id, model_title, method, type_id, pre_store_num, in_num, out_num, back_num, pass_num, repair_num, scrap_num, post_store_num, task_id, agreement_id, manage_type, type_name, type_model_name, result_code, result_msg, remark, status, json_result, creator, create_time, update_time from bm_storage_log