From fc0128242f812e476470dc9bada901d36ae09daf Mon Sep 17 00:00:00 2001 From: zepengdev <lzpsmith@outlook.com> Date: Thu, 31 Jul 2025 16:37:52 +0800 Subject: [PATCH] feat: 1、增加店铺包装费用 2、修复营业时间显示问题和修改异常问题 --- oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreQualification.java | 43 +++++++++++++++---------------------------- 1 files changed, 15 insertions(+), 28 deletions(-) diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreQualification.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreQualification.java index 069b7c8..0f851d5 100644 --- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreQualification.java +++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreQualification.java @@ -1,27 +1,27 @@ package com.oying.modules.pc.store.domain; -import lombok.Data; import cn.hutool.core.bean.BeanUtil; -import io.swagger.annotations.ApiModelProperty; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.oying.base.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.time.LocalTime; -import java.time.ZonedDateTime; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; /** -* @description / * @author lzp * @date 2025-04-22 **/ -@Data +@Getter +@Setter @TableName("pc_store_qualification") -public class StoreQualification implements Serializable { +public class StoreQualification extends BaseEntity implements Serializable { @TableId(value = "qualification_id", type = IdType.AUTO) @ApiModelProperty(value = "资质ID") @@ -42,7 +42,10 @@ private String qualificationName; @ApiModelProperty(value = "资质图片") - private String qualificationImageId; + private Long qualificationImageId; + + @ApiModelProperty(value = "资质图片") + private String qualificationImageUrl; @ApiModelProperty(value = "有效期开始日期") private LocalTime startDate; @@ -50,24 +53,8 @@ @ApiModelProperty(value = "有效期结束日期") private LocalTime endDate; - @ApiModelProperty(value = "状态:1000-草稿 1001-有效 1002-无效") + @ApiModelProperty(value = "状态") private Integer status; - - @NotNull - @ApiModelProperty(value = "创建人") - private Long createBy; - - @NotNull - @ApiModelProperty(value = "创建日期") - private ZonedDateTime createTime; - - @NotNull - @ApiModelProperty(value = "修改人") - private Long updateBy; - - @NotNull - @ApiModelProperty(value = "修改时间") - private ZonedDateTime updateTime; public void copy(StoreQualification source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); -- Gitblit v1.9.3