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

cjl

2023-11-22 319fdcaa2d7979b056b2801e11d08fe6ecdff126

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

@@ -28,10 +28,10 @@
    @ApiModelProperty(value = "基础附件")
    private List<FileAddressVo> fileBaseList;

 /*   @ApiModelProperty(value = "整改附件")
    private List<FileVo> fileChangeList;
   @ApiModelProperty(value = "整改附件")
    private List<FileAddressVo> fileChangeList;

    @ApiModelProperty(value = "审批附件")
    /* @ApiModelProperty(value = "审批附件")
    private List<FileVo> fileApproveList;

    @ApiModelProperty(value = "流程状态")