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

cjl

2023-12-25 2ab4d484c09bf29d5f63dafb0fec3eda23bc4b4e

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

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

    boolean check(Integer id,Integer state);

}