Merge branch 'wb' into qa

cjl

2023-09-26 bd8b3f8e4b5d8af99f267eb5c6efaac03406c620

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

@@ -29,6 +29,11 @@

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


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

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

    Page<AllocationPageExt> extPage(AllocationPageCond allocationPageCond);
    /**
     * 根据id查询详情
@@ -37,6 +42,8 @@
     */
    AllocationExt extOne(Integer id);

     AllocationExt oneAllocation(Integer id);

    void changeAllocation(AllocationChangeCond changeCond);

    void checkAllocation(AllocationCheckCond checkCond);