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

cjl

2023-10-20 fb89f40499211dae5d74caf3cea2ea696745e7a2

 screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java

@@ -46,6 +46,9 @@
    @ApiModelProperty(value = "开始时间")
    private String startTime;

    @ApiModelProperty(value = "单号")
    private String allocationNum;

    @ApiModelProperty(value = "结束时间")
    private String endTime;