From e1cc4a8ac8250d8f76d4d85f49b2b00a4047f0c9 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 11 Sep 2021 17:40:53 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/java/com/matrix/system/activity/dto/UpdateSignAwardSetDto.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 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 20134c2..11ec9f6 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 @@ -11,23 +11,23 @@ @Data @ApiModel(value = "UpdateSignAwardSetDto", description = "查询参数") public class UpdateSignAwardSetDto { - + @ApiModelProperty(value ="活动名称") - private String actName; + private String actName; @ApiModelProperty(value ="活动编码") private String actCode; @ApiModelProperty(value ="活动开始时间") private Date beginTime; @ApiModelProperty(value ="活动结束时间") private Date endTime; - + private SignSetBasicJsonDto signSetBasicJsonDto; - + private List<ActivitySignAwardSet> activitySignAwardSets; - + @ApiModelProperty(value ="活动主表ID") private Long actMainId; - + @ApiModelProperty(hidden = true) private Long companyId; -- Gitblit v1.9.1