增加店内执行计划导出/入功能：兼容原本有数据的判断

src/main/java/com/sfa/operation/strategy/impl/imports/NormalDisplayImportStrategyImpl.java

@@ -244,6 +244,7 @@ public class NormalDisplayImportStrategyImpl implements IImportApExcelStrategy<S
                     updateDisplay.setActualMainShelfExecuted(null);
                 }
             } else if (updateDisplay.getPlannedMainShelfType() != null && updateDisplay.getPlannedMainShelfQty() != null
+                    && (updateDisplay.getActualMainShelfType() != null || dto.getActualMainShelfQty() != null)
                     && (dto.getActualMainShelfType() == null || dto.getActualMainShelfQty() == null) ){
                      // 计划/实际值不全，清空执行状态
                         updateDisplay.setActualMainShelfExecuted("未执行");