From 728466c4924c04dc162811f34086855c51ec0878 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 29 Aug 2025 14:30:23 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreCategory.java | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreCategory.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreCategory.java
index 9c68dbb..1831436 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreCategory.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreCategory.java
@@ -1,24 +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 java.sql.Timestamp;
+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.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
/**
* @description /
* @author lzp
* @date 2025-04-27
**/
-@Data
+@Getter
+@Setter
@TableName("pc_store_category")
-public class StoreCategory implements Serializable {
+public class StoreCategory extends BaseEntity implements Serializable {
@TableId(value = "category_id")
@ApiModelProperty(value = "ID")
@@ -51,18 +54,6 @@
@ApiModelProperty(value = "是否启用(0-否 1-是)")
private Integer active;
-
- @ApiModelProperty(value = "创建人")
- private Long createBy;
-
- @ApiModelProperty(value = "创建时间")
- private Timestamp createTime;
-
- @ApiModelProperty(value = "更新人")
- private Long updateBy;
-
- @ApiModelProperty(value = "更新时间")
- private Timestamp updateTime;
public void copy(StoreCategory source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
--
Gitblit v1.9.3