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

cjl

2023-10-13 f976feb7ae339c006af150b30802f7edfc8d966f

 screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java

@@ -21,4 +21,6 @@


    private Integer applyState;

    private Integer isApprove;
}