Merge branch 'main' of http://th.local.t-aaron.com:13000/THENG/a-cloud-all

ruoyi-common/ruoyi-common-core/pom.xml

@@ -119,6 +119,11 @@
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/ExBaseEntity.java

@@ -0,0 +1,35 @@
+package com.ruoyi.common.core.web.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * ExEntity， 在ExBaseEntity基础上增加了软删除标识
+ *
+ * @author ruoyi
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ExBaseEntity extends BaseEntity {
+
+    /**
+     * 删除标识，0.未删除（默认）；1，已删除
+     */
+    private Long delFlag;
+
+    /**
+     * 更新者
+     */
+    private String deletedBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date deletedTime;
+
+
+}