From 12990a5138e3fa8874a601bfb784a2b1147f0f24 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Tue, 06 Apr 2021 11:53:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/java/com/matrix/system/activity/dto/UpdateSignAwardSetDto.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/activity/dto/UpdateSignAwardSetDto.java b/zq-erp/src/main/java/com/matrix/system/activity/dto/UpdateSignAwardSetDto.java index 186ffd8..20134c2 100644 --- a/zq-erp/src/main/java/com/matrix/system/activity/dto/UpdateSignAwardSetDto.java +++ b/zq-erp/src/main/java/com/matrix/system/activity/dto/UpdateSignAwardSetDto.java @@ -1,11 +1,12 @@ package com.matrix.system.activity.dto; -import java.util.Date; -import java.util.List; import com.matrix.system.activity.entity.ActivitySignAwardSet; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.util.Date; +import java.util.List; @Data @ApiModel(value = "UpdateSignAwardSetDto", description = "查询参数") @@ -25,7 +26,7 @@ private List<ActivitySignAwardSet> activitySignAwardSets; @ApiModelProperty(value ="活动主表ID") - private Long actId; + private Long actMainId; @ApiModelProperty(hidden = true) private Long companyId; -- Gitblit v1.9.1