Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-03-21 e3039d1bee40c32970632d294a6cbc00c4b8793b

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

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

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