Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.4.2304.02
This commit is contained in:
commit
e2570dc520
|
|
@ -221,7 +221,7 @@ public class RemoteExcelServiceImpl extends Service implements RemoteExcelServic
|
|||
result.put(SalaryFormulaReferenceEnum.SALARY_ITEM.getDefaultLabel(),
|
||||
salaryItem2FormulaVar(SalaryFormulaReferenceEnum.SALARY_ITEM, null));
|
||||
result.put(SalaryFormulaReferenceEnum.ISSUED.getDefaultLabel(),
|
||||
salaryItem2FormulaVar(SalaryFormulaReferenceEnum.SALARY_ITEM, null));
|
||||
salaryItem2FormulaVar(SalaryFormulaReferenceEnum.ISSUED, null));
|
||||
result.put(SalaryFormulaReferenceEnum.SALARY_ARCHIVES.getDefaultLabel(),
|
||||
salaryArchives2FormulaVar(SalaryFormulaReferenceEnum.SALARY_ARCHIVES, null));
|
||||
result.put(SalaryFormulaReferenceEnum.ADD_UP_SITUATION.getDefaultLabel(),
|
||||
|
|
|
|||
Loading…
Reference in New Issue