diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java
index ba5feea..910aedf 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java
@@ -134,16 +134,6 @@ public class SysOaWarehouseMasterController extends BaseController {
         return toAjax(iSysOaWarehouseMasterService.updateMasterAndInsertBatchWare(bo));
     }
 
-    //  修改returnType
-    @PutMapping("/returnType")
-    public R<Void> updateReturnType(@RequestParam Long masterId, @RequestParam Integer returnType) {
-        return toAjax(iSysOaWarehouseMasterService.updateReturnType(masterId, returnType));
-    }
-    // 修改withdrawlock
-    @PutMapping("/withdrawLock")
-    public R<Void> updateWithdrawLock(@RequestParam Long masterId, @RequestParam Integer withdrawlock) {
-        return toAjax(iSysOaWarehouseMasterService.updateWithdrawLock(masterId, withdrawlock));
-    }
     //  明细退库
     @PostMapping("/returnDetail")
     public R<Void> returnDetail(@RequestBody List<ReturnDetailBo> returnDetails) {
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java
index 0ce8bcb..7a54821 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java
@@ -60,6 +60,6 @@ public class SysOaWarehouseMaster extends BaseEntity {
     private Integer isLike;
     private Long status;
     private Integer returnType;
-    private Integer withdrawlock;
+    private Integer withdrawLock;
 
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java
index 0763a6c..082c7b5 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java
@@ -76,6 +76,6 @@ public class SysOaWarehouseMasterBo extends BaseEntity {
 
     private  Integer returnType;
 
-    private Integer withdrawlock;
+    private Integer withdrawLock;
 
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java
index f36227a..b4ddda2 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java
@@ -87,7 +87,7 @@ public class SysOaWarehouseMasterVo {
      * 日志操作次数
      */
     private Integer logCount;
-    private Integer withdrawlock;
+    private Integer withdrawLock;
 
 
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java
index a1680c3..15d1d6e 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java
@@ -72,7 +72,6 @@ public interface ISysOaWarehouseMasterService {
      * @return
      */
     int redoMaster(Long masterId);
-    boolean updateReturnType(Long masterId, Integer returnType);
     boolean returnDetail(List<ReturnDetailBo> returnDetails);
 
     /**
@@ -88,5 +87,4 @@ public interface ISysOaWarehouseMasterService {
      */
     Boolean updateRemark(Long masterId, String remark);
 
-    int updateWithdrawLock(Long masterId, Integer withdrawlock);
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java
index 917d1b2..0ae1289 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java
@@ -88,7 +88,7 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
         lqw.eq(bo.getType()!= null, "sowm.type",bo.getType())
                 .eq(bo.getProjectId()!= null, "sowm.project_id", bo.getProjectId())
                 .eq(bo.getReturnType() != null, "sowm.return_type", bo.getReturnType())
-                .eq(bo.getWithdrawlock()!= null, "sowm.withdrawlock", bo.getWithdrawlock())
+                .eq(bo.getWithdrawLock()!= null, "sowm.withdraw_lock", bo.getWithdrawLock())
                 // 其他过滤……
                 .eq("sowm.del_flag",0)
                 .orderByDesc("sowm.update_time");
@@ -304,14 +304,7 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
         return  baseMapper.deleteById(masterId);
     }
 
-    // 2. 修改returnType
-    @Override
-    public boolean updateReturnType(Long masterId, Integer returnType) {
-        SysOaWarehouseMaster update = new SysOaWarehouseMaster();
-        update.setMasterId(masterId);
-        update.setReturnType(returnType);
-        return baseMapper.updateById(update) > 0;
-    }
+
 
     @Override
     public boolean updateIsLike(Long masterId, Integer isLike) {
@@ -331,11 +324,4 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
         return baseMapper.updateById(update) > 0;
     }
 
-    @Override
-    public int updateWithdrawLock(Long masterId, Integer withdrawlock) {
-        SysOaWarehouseMaster update = new SysOaWarehouseMaster();
-        update.setMasterId(masterId);
-        update.setReturnType(withdrawlock);
-        return baseMapper.updateById(update);
-    }
 }
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml
index 06ed621..d083c9b 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml
@@ -22,6 +22,8 @@
         <result property="status"      column="status"/>
         <result property="nearestEndTime"      column="nearest_end_time"/>
         <result property="logCount"    column="logCount"/>
+        <result property="returnType" column="return_type"/>
+        <result property="withdrawLock" column="withdraw_lock"/>
 
         <collection property="warehouseList"
                     column="master_id"
@@ -73,6 +75,8 @@
             sowm.sign_user,
             sowm.remark,
             sowm.status,
+            sown.return_type,
+            sown.withdraw_lock,
             ${ew.sqlSelect},
             sop.project_name,
             IFNULL(log_count.log_count, 0) AS logCount