Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

chenjiahe

2024-02-22 0ff6f9c85c9b89f6328956cc5764b16f789fc94f

 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;

}