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

kaiyu

2021-06-18 4ad67c20b9c5e6625babefeee59ccee155cfc3aa

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

@@ -31,6 +31,7 @@

    private long size;


    private List<UnitConversionVO> unitConversions;

    public static UnitConversionQueryVO convert(UnitConversionQueryDTO dto) {
@@ -64,6 +65,7 @@
        vo.setOriginalUnitName(originalUnit.getDataValue());
        vo.setTargetUnitName(targetUnit.getDataValue());
        vo.setFormula(unitConversion.getFormula());
        vo.setSensorCode(unitConversion.getSensorCode());
        return vo;
    }