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

fwq

2023-07-12 0d820b2125e80c510e55ec85766092fab11ba5e1

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

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

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