Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-05-08 0b26ef7550ac2ae7b779987868cc606418836a4a

Merge branch 'master' into master-test

 phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java

@@ -21,7 +21,7 @@
    /**所属咨询师*/
    private String hisCorpName;
    /**状态:0取消1过期2无效3划扣完成4未划扣5划扣中*/
    private Integer dStatus;
    private Integer deductionStatus;
    /**项目分类*/
    private String typeId;