diff --git a/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/entity/BasicConfig.java b/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/entity/BasicConfig.java index de68e14..1810b81 100644 --- a/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/entity/BasicConfig.java +++ b/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/entity/BasicConfig.java @@ -1,29 +1,35 @@ package org.jeecg.modules.system.entity; +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; /** - * @Description: basic_config + * @Description: 基础配置 * @Author: jeecg-boot - * @Date: 2025-09-24 + * @Date: 2025-09-26 * @Version: V1.0 */ @Data @TableName("basic_config") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@Schema(description="basic_config") +@Schema(description="基础配置") public class BasicConfig implements Serializable { private static final long serialVersionUID = 1L; @@ -50,18 +56,6 @@ /**所属部门*/ @Schema(description = "所属部门") private java.lang.String sysOrgCode; - /**活动开始时间*/ - @Excel(name = "活动开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "活动开始时间") - private java.util.Date startTime; - /**活动结束时间*/ - @Excel(name = "活动结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "活动结束时间") - private java.util.Date endTime; /**分销佣金*/ @Excel(name = "分销佣金", width = 15) @Schema(description = "分销佣金") @@ -82,4 +76,8 @@ @Excel(name = "拼团最大奖励金额", width = 15) @Schema(description = "拼团最大奖励金额") private java.math.BigDecimal maxAmount; + /**团持续时间(小时)*/ + @Excel(name = "团持续时间(小时)", width = 15) + @Schema(description = "团持续时间(小时)") + private java.lang.Integer groundTime; }