tijiaio

src/main/java/com/steerinfo/dil/service/impl/RmsStackingServiceImpl.java

@@ -117,8 +117,6 @@ public class RmsStackingServiceImpl  implements IRmsStackingService {
         return rmsStackingMapper.selectStackNo(stackingId);
     }
 
-<<<<<<< HEAD
-=======
     /*
     * 堆垛原则问题，一旦某垛位堆满，则编辑某垛位启用状态
     * 启用：0  未启用：1
@@ -130,5 +128,5 @@ public class RmsStackingServiceImpl  implements IRmsStackingService {
       rmsStacking.setStackingStatus(stackingStatus);
       return rmsStackingMapper.updateByPrimaryKeySelective(rmsStacking);
     }
->>>>>>> 321ac4ac3ca086d4843a5a122f00b25061b02104
+
 }