Merge remote-tracking branch 'base-version/main' into dev

zt-framework/zt-spring-boot-starter-mybatis/src/main/java/com/zt/plat/framework/mybatis/core/annotation/CompanyColumn.java

@@ -0,0 +1,23 @@
+package com.zt.plat.framework.mybatis.core.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 标记业务实体对应表中的公司字段名称，默认 company_id。
+ *
+ * @author chenbow
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface CompanyColumn {
+
+    /**
+     * 表中公司字段名称
+     */
+    String value() default "company_id";
+}

zt-framework/zt-spring-boot-starter-mybatis/src/main/java/com/zt/plat/framework/mybatis/core/annotation/DeptColumn.java

@@ -0,0 +1,23 @@
+package com.zt.plat.framework.mybatis.core.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 标记业务实体对应表中的部门字段名称，默认 dept_id。
+ *
+ * @author chenbow
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface DeptColumn {
+
+    /**
+     * 表中部门字段名称
+     */
+    String value() default "dept_id";
+}

zt-framework/zt-spring-boot-starter-mybatis/src/main/java/com/zt/plat/framework/mybatis/core/dataobject/BusinessBaseDO.java

@@ -2,6 +2,8 @@ package com.zt.plat.framework.mybatis.core.dataobject;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.zt.plat.framework.mybatis.core.annotation.CompanyColumn;
+import com.zt.plat.framework.mybatis.core.annotation.DeptColumn;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.JdbcType;
@@ -13,6 +15,8 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@CompanyColumn
+@DeptColumn
 public class BusinessBaseDO extends BaseDO {
 
     /** 公司编号  */