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

cjl

2023-12-18 68e750bf109efb0469704e54e48a29649512358c

 screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java

@@ -29,6 +29,10 @@
    @ApiModelProperty(value = "状态名字")
    private String stateName;

    @ApiModelProperty(value = "pc端修改权限标识")
    private String isCode;


    //上报单位名字
    private String escalationUnitName;
}