@@ -0,0 +1,2 @@
+src/config/api.js merge=ours
+config/proxy.ts merge=ours
@@ -2,5 +2,5 @@ export const BASE_PATH = '/api';
//export const projectId = 'Pj3301100002';//之江
//export const projectId = 'Pj1101080259';//博锐
//export const projectId = 'Pj1101140020';//吉因加
-export const projectObj = { projectId: 'Pj1101080259' };
+export const projectObj = { projectId: 'Pj3301100002' };
// export const projectObj = { projectId: 'Pj3301100002' };