Merge branch 'cjl' into qa

cjl

2023-10-20 cbdb9ea8d17e07dda2362d1c61e867afe8395ef2

 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);

}