Merge branch 'fhx-prod-FDD' into master-test

fhx

2024-03-06 0a21e1e41addd1800f5f0e177f5a28e8ba68c39a

 phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java

@@ -2,6 +2,8 @@

import lombok.Data;

import java.math.BigDecimal;

@Data
public class DirectCannelVo {

@@ -11,10 +13,12 @@
    private Integer operateType;
    /**操作疗程数*/
    private Integer operateNum;
    /**操作划扣金额*/
    private BigDecimal deductionTotal;

    /**操作门店标识*/
    /**操作门店标识（废弃）*/
    private String shopId;
    /**操作员工*/
    /**操作员工（废弃）*/
    private String employeeId;
    /**操作员工角色*/
    private String employeeRoleId;