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

fhx

2023-08-15 3b48383729e46bbd4ab0a2867df497489acb4338

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

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

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