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

cjl

2023-11-02 a0a6f95ec5b92be03385eea83b64bf97fcbfa17e

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

@@ -134,4 +134,7 @@
    void checkSmallRoutine(AllocationCheckCond checkCond);


    boolean authority(String allocationNum,Integer userId);


}