2 次代码提交 45679a8460 ... 737a745d6e

作者 SHA1 备注 提交日期
  steelwei 737a745d6e Merge branch 'master' of http://8.152.4.3:3000/yp_other/pet-system 1 月之前
  steelwei acdd339336 1.完成宠物和用户隔离 1 月之前

+ 5 - 0
ruoyi-modules/yingpaipay-archieves/src/main/java/org/dromara/archieves/domain/ArcChangeLog.java

@@ -23,6 +23,11 @@ public class ArcChangeLog implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 目标对象ID
      */

+ 2 - 3
ruoyi-modules/yingpaipay-archieves/src/main/java/org/dromara/archieves/domain/SysTag.java

@@ -1,6 +1,6 @@
 package org.dromara.archieves.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -16,8 +16,7 @@ import java.io.Serial;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "sys_tag", autoResultMap = true)
-@InterceptorIgnore(tenantLine = "true")
-public class SysTag extends BaseEntity {
+public class SysTag extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

+ 5 - 1
ruoyi-modules/yingpaipay-archieves/src/main/java/org/dromara/archieves/domain/SysTagRel.java

@@ -14,7 +14,6 @@ import java.io.Serializable;
  */
 @Data
 @TableName(value = "sys_tag_rel", autoResultMap = true)
-@InterceptorIgnore(tenantLine = "true")
 public class SysTagRel implements Serializable {
 
     @Serial
@@ -26,6 +25,11 @@ public class SysTagRel implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 标签ID
      */

+ 2 - 2
ruoyi-modules/yingpaipay-archieves/src/main/java/org/dromara/archieves/domain/UsrCustomer.java

@@ -1,6 +1,6 @@
 package org.dromara.archieves.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import lombok.Data;
@@ -17,7 +17,7 @@ import java.io.Serial;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("usr_customer")
-public class UsrCustomer extends BaseEntity {
+public class UsrCustomer extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

+ 2 - 2
ruoyi-modules/yingpaipay-archieves/src/main/java/org/dromara/archieves/domain/UsrPet.java

@@ -1,6 +1,6 @@
 package org.dromara.archieves.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import lombok.Data;
@@ -19,7 +19,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("usr_pet")
-public class UsrPet extends BaseEntity {
+public class UsrPet extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;