From e63d043f012ef050738c01082ef5cbfd1f0abbbc Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 07 Apr 2021 12:06:47 +0800
Subject: [PATCH] 修改bug2

---
 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