Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

jyy

2021-06-09 ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c

 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]
    }));
}