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

cjl

2023-09-28 39dc3d6f7168eae8fda1b0fe6671be819d35c732

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

@@ -23,11 +23,13 @@

    Integer insertAllocation(AllocationAddCond allocation);

    AllocationUnitDto check(Integer id);

    void updateAll(AllocationUpdateCond allocationUpdateCond);

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

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

    List<Map<String,Object>> unitExel(Map<String,Object> map);

    Page<AllocationPageExt> extPage(AllocationPageCond allocationPageCond);
    /**