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

cjl

2023-11-22 319fdcaa2d7979b056b2801e11d08fe6ecdff126

 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;