Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

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