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

cjl

2023-09-27 96d893542cc4114673baa53efaa57bb9e6abe771

 screen-api/src/main/java/com/moral/api/service/AllocationService.java

@@ -29,6 +29,8 @@

    List<Allocation> selectAll(Map<String,Object> map);

    List<Integer> unitResult();


    Map<String, Object> selectUnitView(Map<String,Object> map);