Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-05-20 e7bc156f901b06e5af54cfe86fe53e7491af7b7f

 screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java

@@ -63,7 +63,7 @@
        vo.setId(unitConversion.getId());
        vo.setOriginalUnitName(originalUnit.getDataValue());
        vo.setTargetUnitName(targetUnit.getDataValue());
        vo.setFormula(formulaConvert(unitConversion.getFormula(),originalUnit.getDataValue(),targetUnit.getDataValue()));
        vo.setFormula(unitConversion.getFormula());
        return vo;
    }