Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

8 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

 cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminCardStudentVO.java

@@ -9,7 +9,7 @@
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel(value = "根据学员id展示惠民卡二维码VO")
@ApiModel(value = "根据学员id展示玩湃惠民卡二维码VO")
public class HuiminCardStudentVO {
    @ApiModelProperty("有效期至")
    private String endTime;