Merge branch 'master' into cnas

zss

2024-12-26 4497f5b1e322eba5ec519ebc1955317ed656aa8e

 cnas-personnel/src/main/java/com/yuanchu/mom/dto/PersonSupervisionProcessingSheetDto.java

@@ -20,7 +20,7 @@
    private String proposingDepartmentDateString;

    @ApiModelProperty("2 原因分析 部门")
    private String causeAnalysis;
    private String causeAnalysisDepartment;

    @ApiModelProperty("2 原因分析 日期")
    private String causeAnalysisDateString;