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

云

昨天 8c0d4b8f762b1e1535379c604fdc8e2530dc6c8a

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;
}