Merge branch 'master-prod-new' into master-test

chenjiahe

2023-03-23 a2513c6a269fb14939a8e5d16b8be13f5931bd86

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

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

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