fix conflect

wzy

2021-11-11 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d

 zq-erp/src/main/resources/static/js/function/vip.js

@@ -106,7 +106,7 @@
        title: "修改预约排班",
        maxmin: true,
        area: [MUI.SIZE_L, '500px'],
        content: [basePath + '/admin/projService/yypb?pageFlae=1&id=' + id]
        content: [basePath + '/admin/projService/yypb?pageFlae=2&id=' + id]
    }));
}