Merge remote-tracking branch 'refs/remotes/origin/dev_pro2.0' into dev_宁夏_九泓化工

云

10 小时以前 c77086ad2d7949ab36dd0c4e0b59907e672dd64f

 src/api/hrm/salary/calculation/index.ts

@@ -26,6 +26,8 @@
    actualSalary?: number;
    workDays?: number;
    overtimeHours?: number;
    /** 排班总工时（小时） */
    totalWorkHours?: number;
    status?: number;
    statusName?: string;
    remark?: string;