Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-07-07 0ab1b864458f36b294933112824b10b13770915e

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java

@@ -5,6 +5,7 @@
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * @author jqs34
@@ -40,4 +41,7 @@
    @ApiModelProperty(value = "剩余体验人数")
    private Integer explorationSurp;

    @ApiModelProperty(value = "多个商户id")
    private List<Long> shopIds;

}