From ec12ec5a72d2f357a9f5dc9db7044b9469513f0d Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 24 May 2021 13:07:04 +0800
Subject: [PATCH] 因子默认单位添加;角色、菜单更新

---
 screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java
index b7fb204..41d7a4f 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java
+++ b/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;
     }
 

--
Gitblit v1.8.0