Merge remote-tracking branch 'origin/master-fwq-积分抵扣现金' into master-fwq-积分抵扣现金

fwq

2024-04-23 a458dab7990cf8f9d9f834a19db4f2d8b549b467

 phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java

@@ -1,6 +1,6 @@
package com.hz.his.dto;

import com.hz.his.dto.common.OperateDto;
import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
@@ -8,7 +8,7 @@
 * 导出员工Dto
 */
@Data
public class DEmployeeDto extends OperateDto {
public class DEmployeeDto extends DCommonDto {
    private Integer isJob;
    private Integer isPerformanceEmp;
    private String roleUniqueStr;