chenjiahe
2024-02-22 0ff6f9c85c9b89f6328956cc5764b16f789fc94f
Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
2个文件已修改
11 ■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -1,7 +1,5 @@
package com.hz.his.dto.order;
import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
import java.math.BigDecimal;
@@ -61,6 +59,9 @@
    /** 是否第三方退款(0否1是) */
    private Integer isThirdPartyRefund = 1;
    /**必填:退费统计类型(RefundRecord)*/
    private String refundStatistics;
    /**备用参数*/
    //总订单领建标识
    private String hisOrderId;
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java
@@ -52,6 +52,12 @@
    Result monthDeductionEmpNew(@RequestBody ShopReportDto shopReportDto);
    /**
     * SPA门店-员工月执行明细
     */
    @RequestMapping("admin/export/shop/spa/month/deduction/emp/new/list/all")
    Result monthDeductionEmpList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
    /**
     * SPA门店-员工月执行明细导出
     */
    @RequestMapping("admin/export/shop/spa/month/deduction/emp/new/report")