Merge branch 'master' into xin

xin

5 days ago 982313135d1c239fe3b20e4c5664781f92d40aca

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

@@ -7,6 +7,7 @@

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;
@@ -67,6 +68,9 @@
    @ApiModelProperty(value = "是否支持自提")
    private Integer selfPickup;

    @ApiModelProperty(value = "包装费用")
    private BigDecimal packagingFee;

    @ApiModelProperty(value = "店铺资质", example = "[]")
    private List<StoreQualificationCreateRequest> qualificationList = new ArrayList<>();