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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticPartyActivityDTO.java

@@ -1,10 +1,10 @@
package com.panzhihua.common.model.dtos.community.bigscreen;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @ClasssName PageBigScreenStatisticPartyOrg
@@ -36,6 +36,5 @@
    @ApiModelProperty(value = "结束时间", hidden = false, example = "2021-06-01")
    @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式错误")
    private String endTime;


}