Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

gaoluyang

2 天以前 7a5c5250b66cc6faffbcac9e192073473c50f79f

 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;