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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

 screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java

@@ -109,7 +109,7 @@
    }

    public Integer getResidueDay() {
        int day = this.changeDay;
        int day = Objects.isNull(this.changeDay)?0:this.changeDay;
        if(AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(state)){
            Date date = new Date();
            int days = DateUtils.getDays(escalationTime, date);