Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-10-20 a9cc2343ceaad3e99dc25eb036dc99aeded279a6

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

@@ -63,6 +63,9 @@
    @ApiModelProperty(value = "能否审批")
    private Integer isApprove;

    @ApiModelProperty(value = "状态名字")
    private String stateName;

    public Integer getResidueDay() {
        int day = this.changeDay;
        if(AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(state)){