diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java
index 1658bde01..562f5fe00 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java
@@ -4,9 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.cf.imes.module.system.controller.admin.machine.vo.CuttingRespVO;
 import com.cf.imes.module.system.controller.admin.machine.vo.CuttingSaveReqVO;
 import com.cf.imes.module.system.dal.dataobject.machine.MachineDO;
-import com.cf.imes.module.system.dal.dataobject.machine.MachineLimitDO;
-
-import java.util.Objects;
 
 /**
  * @author Beal
@@ -26,7 +23,7 @@ public class MachineConvert {
 
     }
 
-    public static CuttingRespVO convert(MachineDO machineDO, MachineLimitDO machineLimitDO) {
+    public static CuttingRespVO convert(MachineDO machineDO) {
         return CuttingRespVO.builder()
                 .id(machineDO.getId())
                 .machineSettingDO(JSON.parseObject(machineDO.getSetting()))
@@ -36,9 +33,6 @@ public class MachineConvert {
                 .name(machineDO.getName())
                 .machineType(machineDO.getMachineType())
                 .labelId(machineDO.getLabelId())
-                .showAutoNotePrinter(Objects.isNull(machineLimitDO)? Boolean.FALSE: machineLimitDO.getShowAutoNotePrinter())
-                .showDualWorkstation(Objects.isNull(machineLimitDO)? Boolean.FALSE: machineLimitDO.getShowDualWorkstation())
-                .showPriorFacing(Objects.isNull(machineLimitDO)? Boolean.FALSE: machineLimitDO.getShowPriorFacing())
                 .build();
 
     }
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
index b16de5ba3..564d21acb 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
@@ -259,11 +259,11 @@ public class MachineServiceImpl implements MachineService {
 
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         assert loginUser != null;
-        MachineLimitDO machineLimitDO = machineLimitMapper.selectOne(new LambdaQueryWrapperX<MachineLimitDO>()
-                .eq(MachineLimitDO::getMachineId, id)
-                .eq(MachineLimitDO::getOrganId, loginUser.getOrganId())
-        );
-        CuttingRespVO respVO = MachineConvert.convert(machineDO, machineLimitDO);
+//        MachineLimitDO machineLimitDO = machineLimitMapper.selectOne(new LambdaQueryWrapperX<MachineLimitDO>()
+//                .eq(MachineLimitDO::getMachineId, id)
+//                .eq(MachineLimitDO::getOrganId, loginUser.getOrganId())
+//        );
+        CuttingRespVO respVO = MachineConvert.convert(machineDO);
         return respVO;
     }