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

cjl

2023-11-15 f6eada9ffd2fe2b8fdf45e2cc51d4290704ab24a

 screen-api/src/main/java/com/moral/api/entity/Allocation.java

@@ -135,6 +135,10 @@
     * 作废理由
     */
    private String invalidReason;
    /**
     * 重点任务类型
     */
    private Integer keyPoint;


}