Merge branch 'main' of http://git.cc-lotus.info/Information/cxyy-service

public/importMapping.js

@@ -97,10 +97,4 @@ const company = [
   { index: 19, field: 'brief', zh: '简介' },
 ];
 
-module.exports = {
-  achievement,
-  project,
-  demand,
-  supply,
-  company,
-};
+export { achievement, project, demand, supply, company };

src/service/util.service.ts

@@ -12,7 +12,8 @@ import { Supply } from '../entity/platform/supply.entity';
 import { Project } from '../entity/platform/project.entity';
 import { Demand } from '../entity/platform/demand.entity';
 import { UserService } from './system/user.service';
-const mappings = require('../../public/importMapping');
+// const mappings = require('../../public/importMapping');
+import * as mappings from '../public/importMapping';
 import * as Excel from 'exceljs';
 import * as Path from 'path';
 import * as fs from 'fs';