From c18037dc5de7f67175c2cf80cd04761d198739b5 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 12 Apr 2021 19:48:50 +0800 Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop --- zq-erp/src/main/java/com/matrix/system/activity/dto/SignWriteoffListDto.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/activity/dto/SignWriteoffListDto.java b/zq-erp/src/main/java/com/matrix/system/activity/dto/SignWriteoffListDto.java index 5acbdc0..43b04b2 100644 --- a/zq-erp/src/main/java/com/matrix/system/activity/dto/SignWriteoffListDto.java +++ b/zq-erp/src/main/java/com/matrix/system/activity/dto/SignWriteoffListDto.java @@ -1,9 +1,6 @@ package com.matrix.system.activity.dto; -import java.util.Date; - import com.matrix.core.pojo.BasePageQueryDto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,6 +11,9 @@ @ApiModelProperty(value ="中奖者姓名") private String zjzxm; + + @ApiModelProperty(value ="活动名称/编码") + private String hdmcbm; @ApiModelProperty(hidden = true) private Long companyId; -- Gitblit v1.9.1