Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

wangrenhuang

2023-10-10 72bbcf99e4eee03402278fa506c45a7d135d5d51

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

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

    /** 治疗单id */
    /** 治疗单id(目前没用) */
    private String treatSingleId;
    /** 创建方式（OrderTotalConstants） */
    private String addWay;
}