Merge branch 'master' into xin

xin

5 days ago 982313135d1c239fe3b20e4c5664781f92d40aca

 oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreFieldUpdateRequest.java

@@ -1,5 +1,6 @@
package com.oying.modules.pc.store.domain.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -34,10 +35,16 @@
    @NotNull(groups = UpdateStoreBusinessStatusGroup.class)
    private Integer businessStatus;

    @ApiModelProperty(value = "店铺logo图片")
    private Long logoImageId;

    public interface UpdateStoreLogoImageGroup{}

    @NotBlank(groups = UpdateStoreLogoImageGroup.class)
    private String logoImageUploadId;

    @ApiModelProperty(value = "店铺封面图")
    private Long coverImageId;

    public interface UpdateStoreCoverImageGroup{}

@@ -67,9 +74,11 @@
    public interface UpdateStoreBusinessHoursGroup{}

    @NotNull(groups = UpdateStoreBusinessHoursGroup.class)
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
    private LocalTime openTime;

    @NotNull(groups = UpdateStoreBusinessHoursGroup.class)
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
    private LocalTime closeTime;

    public interface UpdateStoreAddressGroup{}