Merge branch 'cjl' into qa

cjl

2023-10-07 8b5439ba2748f91720975f73e7479a751d6a452b

 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;