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

cjl

2023-11-15 f6eada9ffd2fe2b8fdf45e2cc51d4290704ab24a

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

@@ -39,6 +39,6 @@
    */
    boolean save(AllocationExtensionAddCond allocationExtensionAddCond);

    boolean check(Integer id,Integer sate);
    boolean check(Integer id,Integer state);

}