Merge branch 'master' into master-test

wangrenhuang

2023-11-23 e69d8ab491d1a41838ac2226d30712861cd7c27b

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

@@ -101,4 +101,6 @@
    private String treatSingleId;
    /** 创建方式（OrderTotalConstants） */
    private String addWay;
    /**是否拼团 0 否 1 是*/
    private Integer isGroupBuy;
}