phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -43,4 +43,6 @@ public static final String TYPE_COMMON_DRAW = "draw"; /**公共标识类型,ken活动领取 */ public static String TYPE_COMMON_ACTIVITY_KEN = "activity_ken"; /**公共标识类型,ken活动领取 */ public static String TYPE_COMMON_BURST_ACTIVITY = "burst_activity"; } phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -1,5 +1,7 @@ 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; @@ -105,4 +107,10 @@ private String addWay; /**是否拼团 0 否 1 是*/ private Integer isGroupBuy; /**活动页面类型(0默认标准),如果需要特需处理,填写这个,默认0*/ private Integer activityPageType = 0; /**活动区分编号-用于一次性活动,存储活动编号,便于查找*/ private String activityPageCode; } 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")