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

cjl

2023-11-14 15369bf819ca82896bbcada782e6babf2a7d64c9

 screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java

@@ -74,6 +74,8 @@

    @ApiModelProperty(value = "状态名字")
    private String stateName;
    //上报单位名字
    private String escalationUnitName;

    public Integer getResidueDay() {
       int day=0;