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

cjl

2024-04-18 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8

 screen-api/src/main/java/com/moral/api/entity/AllocationExtension.java

@@ -38,6 +38,11 @@
    private Integer extensionNum;

    /**
     * 延期前天数
     */
    private Integer extensionOldNum;

    /**
     * 延期理由
     */
    private String remake;