Merge branch 'ap' into dev

src/views/promotion/display_schedule/tabs/data.jsx

@@ -2744,7 +2744,7 @@ export const getScheduleDisConfig = (submitChange) => {
             row.actualOtherDisplayExecuted = row.actualOtherDisplay === '执行与计划一致' ? '执行' : '未执行'
             return row.actualOtherDisplayExecuted
           },
-          formulaStr: "公式：其他陈列-数量+形式实际，有值"
+          formulaStr: "公式：实际与计划是否一致"
         },
         {
           "label": "合计费用 - 费用",