Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-07-19 40348fdd0205d4a7c16bb5e732e51324ed580f64

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

@@ -30,13 +30,12 @@
    private String orderId;
    /**状态*/
    private Integer status;
   //是否SPA(0:否,1:是)
    /**是否SPA(0:否,1:是)*/
    private Integer isSpa;


    //用户所属子项目id(UserProjectItem)
    /**用户所属子项目id(UserProjectItem)*/
    private String userProjectItemId;

    /**是否处理蔡医生名称*/
    private Integer handlerDoctorName = 0;
}