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

lizijie

2021-06-17 b98a61c0c707c9fc3a51e68fe67909cb06aaafcd

 screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionInsertForm.java

@@ -28,6 +28,11 @@
    * */
    private String formula;

    /*
    * 使用因子code，如果为null则为通用
    * */
    private String sensorCode;

    public boolean valid(){
        if(
                ObjectUtils.isEmpty(originalUnitKey)||
@@ -43,6 +48,7 @@
        unitConversion.setOriginalUnitKey(originalUnitKey);
        unitConversion.setTargetUnitKey(targetUnitKey);
        unitConversion.setFormula(formula);
        unitConversion.setSensorCode(sensorCode);
        return unitConversion;
    }