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

chenjiahe

2023-06-26 a7d770d976a4d421ca7594f6e99daf16c225d49c

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

@@ -42,4 +42,6 @@

    /**是否查询积分订单*/
    private Integer isIntegral;
    //是否查询已完成订单
    private Integer isSuc;
}