Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

 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;
}