Merge branch 'master-prod-new' into master-fwq抽奖配置

fwq

2023-10-30 ef212c321c6d833d69091e7491521f7d11984bfb

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

@@ -97,6 +97,10 @@
    /**非必填 活动规则标识集合*/
    private List<String> activityIds;

    /** 治疗单id */
    /** 治疗单id(目前没用) */
    private String treatSingleId;
    /** 创建方式（OrderTotalConstants） */
    private String addWay;
    /**是否拼团 0 否 1 是*/
    private Integer isGroupBuy;
}