Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

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

@@ -112,4 +112,9 @@
    private String activityPageCode;
    /**活动区分标题*/
    private String activityPageName;

    /** 订单是否要老带新返佣(0否1是) */
    private Integer isLdxRebate = 1;
    /** 订单是否能用优惠券(0否1是) */
    private Integer isCanUseCoupon = 1;
}