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

fhx

2023-10-11 ed43bd0e7f5520f227c329ef436adb1e278016a7

 phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterEmployeeDto.java

@@ -11,5 +11,10 @@
    /**人员类型,不传默认医生类型*/
    private Integer type;
    /**人员标识(员工标识)*/
    private Integer commonId;
    private String commonId;

    /**人员类型-医生*/
    public static final Integer TYPE_DOCTOR = 0;
    /**人员类型-护士*/
    public static final Integer TYPE_NURSE = 1;
}