From dc1c8c974d9469591ead4dd1d774bbfb97a33331 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 27 Sep 2023 17:51:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb

---
 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