Merge branch 'bug_fix' into 'master'

时间bugfix See merge request !254

Merge branch 'bug_fix' into 'master'
时间bugfix See merge request !254
张志伟
2 parents acd01b06 35cc926d
Showing 2 changed files with 2 additions and 2 deletions
src/pages/performance/EvaGroupSetting/EditComfirm/index.tsx
src/pages/performance/KpiGroupSetting/components/PostModal.tsx
@@ -126,7 +126,7 @@ function Index(props: Props) {
       console.log("总的提交表单pa", pa);
       if (pa.stages && pa.stages?.length > 1) {
         boo1 = pa.stages.every(
-          (item: any, index: number, arr: any[]) => item.overTime + 24 * 60 * 60 * 1000<
+          (item: any, index: number, arr: any[]) => item.overTime + 24 * 60 * 59 * 1000<
             (index + 1 < arr.length ? arr[index + 1].beginTime : item.overTime + 48 * 60 * 60 * 1000)
         );
       }
@@ -16,7 +16,7 @@ export default function ShopModal({ postModal, onCancel }: Props) {
     <Modal title="适用岗位" open={visible} onCancel={() => onCancel()} onOk={() => onCancel()}>
       <Table dataSource={record?.postNames?.map((item: any) => ({ postName: item }))} rowKey="postName">
         <Column
-          title="适用门店"
+          title="适用岗位"
           dataIndex="postName"
           key="postName"
           render={(postName: string) => postName || ""}