diff --git a/game-server/app/servers/role/handler/roleHandler.ts b/game-server/app/servers/role/handler/roleHandler.ts
index 870cfa568..7e5e29af2 100644
--- a/game-server/app/servers/role/handler/roleHandler.ts
+++ b/game-server/app/servers/role/handler/roleHandler.ts
@@ -10,8 +10,14 @@ import { getTeraphAttr, getAtrrNameById } from '../../../consts/constModules/abi
 const _ = require('underscore');
 import { SclResultInter, SclPosInter } from '../../../pubUtils/interface';
 import { SchoolModel } from '../../../db/School';
+<<<<<<< Updated upstream
 import { checkMaterialEnough } from '../../../services/roleService'
 import { calPlayerCeAndSave, calAllHeroCe } from '../../../services/playerCeService';
+=======
+import { checkMaterialEnough } from '../../../services/roleService';
+import { calAllHeroCe } from '../../../services/playerCeService';
+import { calPlayerCeAndSave } from '../../../services/playerCeService';
+>>>>>>> Stashed changes
 import { HERO_SYSTEM_TYPE } from '../../../consts';
 
 export default function(app: Application) {
diff --git a/shared/pubUtils/data.ts b/shared/pubUtils/data.ts
index 04ac15408..eac5cbb3c 100644
--- a/shared/pubUtils/data.ts
+++ b/shared/pubUtils/data.ts
@@ -245,4 +245,25 @@ export function getFieldByStage(stage: number, jobid: number) {
 export function getSuit(id: number) {
     const suitInfo = gameData.suit.get(id);
     return suitInfo;
+}
+
+export function getSchoolRateByStar(star: number, colorStar: number, quality: number) {
+    const schoolRate = gameData.schoolRate.get(`${star}_${colorStar}_${quality}`);
+    return schoolRate;
+}
+
+export function getScollByStar(quality: number, star: number, curQuality: number, colorStar: number) {
+    const heroScroll = gameData.heroScroll.get(`${quality}_${star}_${curQuality}_${colorStar}`);
+    return heroScroll;
+}
+
+// 根据存在升星表等的stage字段的id对应17维id
+export function getFieldByStage(stage: number, jobid: number) {
+    let targetAttrId = ABI_TYPE_TO_STAGE.get(stage);
+    if(typeof targetAttrId === 'number') {
+        return targetAttrId
+    } else {
+        const dicJob = gameData.job.get(jobid);
+        return targetAttrId(dicJob.type);
+    }
 }
\ No newline at end of file