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

jinpengyong

2023-11-15 84e740f362d574b942b1c9a274425841c9167de8

 screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java

@@ -136,6 +136,9 @@
    @ApiModelProperty(value = "流程状态")
    private List<ApproveTableListVo> approveList;

    @ApiModelProperty(value = "重点任务类型")
    private Integer keyPoint;

    @TableField(exist = false)
    private String time;