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

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

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

@@ -26,7 +26,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="Allocation - 更新考核对象", description="Allocation - 更新考核对象")
public class AllocationCheckCond implements Serializable {
public class    AllocationCheckCond implements Serializable {

    @ApiModelProperty(value = "主键id")
    @NotNull(message = "主键id不能为空！")