Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

zhanglin8526

2023-08-26 0af329d7210a84c97ec071735a2d0d1d7b0b785c

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateMemberTaskDto.java

@@ -4,8 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @author jqs34
 * @ClassName merCreateMemberTaskDto
@@ -25,5 +23,6 @@
    @ApiModelProperty(value = "任务内容")
    private String taskContent;


    @ApiModelProperty(value="紧急情况")
    private String emergencyState;;
}