Merge branch 'master' into master-test

wangrenhuang

2023-11-06 e6760711ae80d54481d1cb7321e10a3c6f2cb795

 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;
}