From 5242d687d4edcd6c0f7e10fb82b0e5505dbb3da3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 08:24:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/utils/UnitConvertUtils.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/utils/UnitConvertUtils.java b/screen-api/src/main/java/com/moral/api/utils/UnitConvertUtils.java
index 5355a24..351b648 100644
--- a/screen-api/src/main/java/com/moral/api/utils/UnitConvertUtils.java
+++ b/screen-api/src/main/java/com/moral/api/utils/UnitConvertUtils.java
@@ -177,4 +177,5 @@
     }
 
 
+
 }

--
Gitblit v1.8.0