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

# Conflicts:
#	vetti-hotakes/src/main/java/com/vetti/hotake/domain/HotakeSysNoticeType.java
#	vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeTypeDto.java
#	vetti-hotakes/src/main/java/com/vetti/hotake/mapper/HotakeSysNoticeTypeMapper.java
#	vetti-hotakes/src/main/java/com/vetti/hotake/service/IHotakeSysNoticeTypeService.java
#	vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeSysNoticeTypeServiceImpl.java
#	vetti-hotakes/src/main/resources/mapper/hotake/HotakeSysNoticeTypeMapper.xml
This commit is contained in:
2025-11-01 21:31:37 +08:00
7 changed files with 618 additions and 0 deletions

View File

@@ -0,0 +1,42 @@
package com.vetti.hotake.domain;
import lombok.Data;
import lombok.experimental.Accessors;
import io.swagger.annotations.ApiModelProperty;
import com.vetti.common.annotation.Excel;
import com.vetti.common.core.domain.BaseEntity;
import java.util.List;
/**
* 通知类型对象 hotake_sys_notice_type
*
* @author ID
* @date 2025-11-01
*/
@Data
@Accessors(chain = true)
public class HotakeSysNoticeType extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键ID */
@ApiModelProperty("主键ID")
private Long id;
/** 类型名称 */
@ApiModelProperty("类型名称")
@Excel(name = "类型名称")
private String typeName;
/** 图片 */
@ApiModelProperty("图片")
@Excel(name = "图片")
private List<String> imagePath;
/** 删除状态0正常 1删除 */
@ApiModelProperty("删除状态0正常 1删除")
@Excel(name = "删除状态", readConverterExp = "0=正常,1=删除")
private String isDel;
}

View File

@@ -0,0 +1,26 @@
package com.vetti.hotake.domain.dto;
import com.vetti.common.utils.bean.BeanUtils;
import com.vetti.hotake.domain.HotakeSysNoticeType;
import lombok.Data;
import java.util.List;
/**
* @author ID
* @date 2025/11/1 11:54
*/
@Data
public class HotakeSysNoticeTypeDto extends HotakeSysNoticeType {
private List<String> imgs;
public static HotakeSysNoticeTypeDto build(List<String> urls, HotakeSysNoticeType data) {
HotakeSysNoticeTypeDto dto = new HotakeSysNoticeTypeDto();
BeanUtils.copyBeanProp(dto, data);
dto.setImgs(urls);
return dto;
}
}