Merge branch 'master-fwq-爆款活动2.0' into master-test

fwq

2024-06-07 5bb9492f10f08c8f2ab5485d25ae9e2bbf3a3849

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java

@@ -27,6 +27,6 @@
     * 根据活动编码查询赠送的增值金
     */
    @PostMapping(value = "/order/activity/increment/money")
    Result getActivityIncrement(@RequestBody OrderActivityVo orderActivityVo);
    Result getActivityReturn(@RequestBody OrderActivityVo orderActivityVo);

}