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

zss

2026-04-25 d34a44a1ffa778c0a95027f67d56544b0faa4930

1
2
3
4
5
6
7
8
9
package com.ruoyi.staff.dto;
 
import com.ruoyi.staff.pojo.StaffContract;
import lombok.Data;
 
@Data
public class StaffContractDto extends StaffContract {
    private String staffName;
}