Merge branch 'master-prod-new' into chenjiahe-新版回访

chenjiahe

2024-05-27 98fe87967986bf4ad01f19ca2f3c54ae067fa43c

 phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java

@@ -44,6 +44,6 @@
    /**关联标识*/
    private String relationId;
    /**关联名称*/
    private Integer relationName;
    private String relationName;

}