Merge branch 'promotion' into release

src/views/promotion/plan/effectivePlan.vue

@@ -1047,7 +1047,7 @@ const tableRowClassName = ({ row }) => {
   }
 }
 const formatterConfirm = (row, col, value) => {
-  if (col.property === 'clockInTime' || col.property === 'clockOutTime' || col.property === 'date') {
+  if (col.property === 'clockInTime' || col.property === 'clockOutTime' || col.property === 'date' || col.property === 'noonClockOutTime' || col.property === 'noonClockInTime') {
     return parseTime(value)
   } else if (col.property === 'errorMsg') {
     // 把分号替换成 \n