From ac832618393aca09f81d6bd04117e0cdb32301c3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 01 Dec 2023 15:35:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

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

diff --git a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
index 7fa6f9a..07c8d6e 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
@@ -173,7 +173,6 @@
         return ResultMessage.ok(ObjectUtils.isEmpty(map1)? "0":map1);
     }
 
-
     @GetMapping("unitExel")
     public void unitExel(HttpServletResponse response,HttpServletRequest request){
         Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);

--
Gitblit v1.8.0