Merge remote-tracking branch 'origin/master'

This commit is contained in:
gaowdong 2025-04-18 18:04:27 +08:00
commit 7d21959bbb
1 changed files with 4 additions and 3 deletions

View File

@ -1,6 +1,7 @@
package com.bonus.canteen.core.menu.vo; package com.bonus.canteen.core.menu.vo;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.bonus.canteen.core.common.utils.FileUrlUtil;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -42,9 +43,9 @@ public class AppletReserveRecipeDishesVO {
@ApiModelProperty("口味列表") @ApiModelProperty("口味列表")
private List<String> tasteNameList; private List<String> tasteNameList;
// public String getDishesImgUrl() { public String getDishesImgUrl() {
// return ObjectUtil.isNotEmpty(this.dishesImgUrl) ? SysUtil.getCutFileUrl(this.dishesImgUrl.split(",")[0]) : this.dishesImgUrl; return ObjectUtil.isNotEmpty(this.dishesImgUrl) ? FileUrlUtil.getFileUrl(this.dishesImgUrl.split(",")[0]) : this.dishesImgUrl;
// } }
public Long getBaseDishesId() { public Long getBaseDishesId() {
return baseDishesId; return baseDishesId;