diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/constant/BaseConstant.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/constant/BaseConstant.java
similarity index 86%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/constant/BaseConstant.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/constant/BaseConstant.java
index fa941ead9..cba8d05f6 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/constant/BaseConstant.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/constant/BaseConstant.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.constant;
+package org.dromara.md.form.api.constant;
 
 public interface BaseConstant {
     /**
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/constant/FormFieldDictType.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/constant/FormFieldDictType.java
similarity index 96%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/constant/FormFieldDictType.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/constant/FormFieldDictType.java
index 8eebae979..63dee8a71 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/constant/FormFieldDictType.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/constant/FormFieldDictType.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.constant;
+package org.dromara.md.form.api.constant;
 
 
 import lombok.AllArgsConstructor;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/constant/FormTemplateFieldType.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/constant/FormTemplateFieldType.java
similarity index 95%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/constant/FormTemplateFieldType.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/constant/FormTemplateFieldType.java
index e487b1cd2..7b626e9f8 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/constant/FormTemplateFieldType.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/constant/FormTemplateFieldType.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.constant;
+package org.dromara.md.form.api.constant;
 
 
 import lombok.AllArgsConstructor;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/DictCodesDTO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/DictCodesDTO.java
similarity index 86%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/DictCodesDTO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/DictCodesDTO.java
index 083339aba..80c525113 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/DictCodesDTO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/DictCodesDTO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.dto;
+package org.dromara.md.form.api.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormDictDTO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormDictDTO.java
similarity index 95%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormDictDTO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormDictDTO.java
index c979df193..5c6ef62fe 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormDictDTO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormDictDTO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.dto;
+package org.dromara.md.form.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormDictImportDTO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormDictImportDTO.java
similarity index 94%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormDictImportDTO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormDictImportDTO.java
index 7813f9abf..6f77272b7 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormDictImportDTO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormDictImportDTO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.dto;
+package org.dromara.md.form.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormFieldDictDTO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormFieldDictDTO.java
similarity index 99%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormFieldDictDTO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormFieldDictDTO.java
index 6dc571a99..fc0cf56de 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormFieldDictDTO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormFieldDictDTO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.dto;
+package org.dromara.md.form.api.dto;
 
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormFieldDictImportDTO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormFieldDictImportDTO.java
similarity index 90%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormFieldDictImportDTO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormFieldDictImportDTO.java
index 364319e95..a9a01f2b7 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormFieldDictImportDTO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormFieldDictImportDTO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.dto;
+package org.dromara.md.form.api.dto;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormFieldDictQ.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormFieldDictQ.java
similarity index 94%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormFieldDictQ.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormFieldDictQ.java
index b211539a2..4f1ddd73a 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormFieldDictQ.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormFieldDictQ.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.dto;
+package org.dromara.md.form.api.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintConfigDTO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormPrintConfigDTO.java
similarity index 98%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintConfigDTO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormPrintConfigDTO.java
index 9a7b3e45b..d09709d37 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintConfigDTO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormPrintConfigDTO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.dto;
+package org.dromara.md.form.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintConfigModeDTO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormPrintConfigModeDTO.java
similarity index 94%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintConfigModeDTO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormPrintConfigModeDTO.java
index f7b98b764..31b2c7cca 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintConfigModeDTO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormPrintConfigModeDTO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.dto;
+package org.dromara.md.form.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintConfigUploadDTO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormPrintConfigUploadDTO.java
similarity index 96%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintConfigUploadDTO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormPrintConfigUploadDTO.java
index 4d81d41fd..f92b34e4b 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintConfigUploadDTO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormPrintConfigUploadDTO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.dto;
+package org.dromara.md.form.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintDTO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormPrintDTO.java
similarity index 95%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintDTO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormPrintDTO.java
index 5cc448aa9..0cf5a41f5 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintDTO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormPrintDTO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.dto;
+package org.dromara.md.form.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormTemplateDTO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormTemplateDTO.java
similarity index 99%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormTemplateDTO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormTemplateDTO.java
index c47bd1a36..18f5c9251 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormTemplateDTO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/FormTemplateDTO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.dto;
+package org.dromara.md.form.api.dto;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/ModifyLogRecordDTO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/ModifyLogRecordDTO.java
similarity index 98%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/ModifyLogRecordDTO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/ModifyLogRecordDTO.java
index 3df4b0a57..386ba8f71 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/ModifyLogRecordDTO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/dto/ModifyLogRecordDTO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.dto;
+package org.dromara.md.form.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormDictVO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormDictVO.java
similarity index 97%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormDictVO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormDictVO.java
index f38848e0e..be185642a 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormDictVO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormDictVO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.vo;
+package org.dromara.md.form.api.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormFieldDictDifyVo.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormFieldDictDifyVo.java
similarity index 87%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormFieldDictDifyVo.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormFieldDictDifyVo.java
index ca2f67efb..a460ce78a 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormFieldDictDifyVo.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormFieldDictDifyVo.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.vo;
+package org.dromara.md.form.api.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormFieldDictVO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormFieldDictVO.java
similarity index 95%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormFieldDictVO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormFieldDictVO.java
index e883ee06d..8e9cd9a10 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormFieldDictVO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormFieldDictVO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.vo;
+package org.dromara.md.form.api.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormPrintConfigVO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormPrintConfigVO.java
similarity index 97%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormPrintConfigVO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormPrintConfigVO.java
index f1a6a31cf..1f91591d7 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormPrintConfigVO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormPrintConfigVO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.vo;
+package org.dromara.md.form.api.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormTemplateVO.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormTemplateVO.java
similarity index 98%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormTemplateVO.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormTemplateVO.java
index 34c7263d9..1c05c2646 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormTemplateVO.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/org/dromara/md/form/api/vo/FormTemplateVO.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.api.vo;
+package org.dromara.md.form.api.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/FormFieldDictFeignClient.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/FormFieldDictFeignClient.java
similarity index 92%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/FormFieldDictFeignClient.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/FormFieldDictFeignClient.java
index f3f8a9acd..0d67b3af9 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/FormFieldDictFeignClient.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/FormFieldDictFeignClient.java
@@ -1,9 +1,9 @@
-package com.dromara.md.form.feign;
+package org.dromara.md.form.feign;
 
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.dto.FormFieldDictQ;
-import com.dromara.md.form.api.vo.FormFieldDictDifyVo;
-import com.dromara.md.form.api.vo.FormFieldDictVO;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.dto.FormFieldDictQ;
+import org.dromara.md.form.api.vo.FormFieldDictDifyVo;
+import org.dromara.md.form.api.vo.FormFieldDictVO;
 import io.swagger.annotations.Api;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/FormPrintConfigFeignClient.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/FormPrintConfigFeignClient.java
similarity index 83%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/FormPrintConfigFeignClient.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/FormPrintConfigFeignClient.java
index 28f7c49be..324f8ddea 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/FormPrintConfigFeignClient.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/FormPrintConfigFeignClient.java
@@ -1,7 +1,7 @@
-package com.dromara.md.form.feign;
+package org.dromara.md.form.feign;
 
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.vo.FormPrintConfigVO;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.vo.FormPrintConfigVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/FormTemplateFeignClient.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/FormTemplateFeignClient.java
similarity index 91%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/FormTemplateFeignClient.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/FormTemplateFeignClient.java
index caf8e18d7..fc0d9ba1a 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/FormTemplateFeignClient.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/FormTemplateFeignClient.java
@@ -1,7 +1,7 @@
-package com.dromara.md.form.feign;
+package org.dromara.md.form.feign;
 
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.vo.FormTemplateVO;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.vo.FormTemplateVO;
 import io.swagger.annotations.Api;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/ModifyLogRecordFeignClient.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/ModifyLogRecordFeignClient.java
similarity index 85%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/ModifyLogRecordFeignClient.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/ModifyLogRecordFeignClient.java
index 752dba2b6..c183e7497 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/ModifyLogRecordFeignClient.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/ModifyLogRecordFeignClient.java
@@ -1,7 +1,7 @@
-package com.dromara.md.form.feign;
+package org.dromara.md.form.feign;
 
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.dto.ModifyLogRecordDTO;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.dto.ModifyLogRecordDTO;
 import io.swagger.annotations.Api;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/SystemDictFeignClient.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/SystemDictFeignClient.java
similarity index 83%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/SystemDictFeignClient.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/SystemDictFeignClient.java
index 112ba8ed0..e3254b114 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/SystemDictFeignClient.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/org/dromara/md/form/feign/SystemDictFeignClient.java
@@ -1,8 +1,8 @@
-package com.dromara.md.form.feign;
+package org.dromara.md.form.feign;
 
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.dto.FormFieldDictQ;
-import com.dromara.md.form.api.vo.FormFieldDictVO;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.dto.FormFieldDictQ;
+import org.dromara.md.form.api.vo.FormFieldDictVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/Form.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/Form.java
similarity index 94%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/Form.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/Form.java
index b15af1165..4c931b250 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/Form.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/Form.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.mybatis.entity;
+package org.dromara.md.form.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormDict.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormDict.java
similarity index 96%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormDict.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormDict.java
index 2f39f774f..2d4a04a48 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormDict.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormDict.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.mybatis.entity;
+package org.dromara.md.form.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormFieldDict.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormFieldDict.java
similarity index 97%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormFieldDict.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormFieldDict.java
index 089899cd4..dc99a7f8e 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormFieldDict.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormFieldDict.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.mybatis.entity;
+package org.dromara.md.form.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormPrintConfig.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormPrintConfig.java
similarity index 98%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormPrintConfig.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormPrintConfig.java
index 997035d71..cda1a5dbe 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormPrintConfig.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormPrintConfig.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.mybatis.entity;
+package org.dromara.md.form.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormTemplate.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormTemplate.java
similarity index 96%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormTemplate.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormTemplate.java
index 74c0d41cc..c05a441e3 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormTemplate.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormTemplate.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.mybatis.entity;
+package org.dromara.md.form.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormTemplateField.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormTemplateField.java
similarity index 98%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormTemplateField.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormTemplateField.java
index 4af516729..d6df49344 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormTemplateField.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/FormTemplateField.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.mybatis.entity;
+package org.dromara.md.form.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/ModifyLogRecord.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/ModifyLogRecord.java
similarity index 97%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/ModifyLogRecord.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/ModifyLogRecord.java
index 650c8e425..7936aebdf 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/ModifyLogRecord.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/ModifyLogRecord.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.mybatis.entity;
+package org.dromara.md.form.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/TenantInitStatus.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/TenantInitStatus.java
similarity index 95%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/TenantInitStatus.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/TenantInitStatus.java
index ad24415f9..cea6df825 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/TenantInitStatus.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/entity/TenantInitStatus.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.mybatis.entity;
+package org.dromara.md.form.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormDictMapper.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormDictMapper.java
similarity index 70%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormDictMapper.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormDictMapper.java
index 4fd3ced32..06d9b5fe4 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormDictMapper.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormDictMapper.java
@@ -1,7 +1,7 @@
-package com.dromara.md.form.mybatis.mapper;
+package org.dromara.md.form.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dromara.md.form.mybatis.entity.FormDict;
+import org.dromara.md.form.mybatis.entity.FormDict;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormFieldDictMapper.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormFieldDictMapper.java
similarity index 77%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormFieldDictMapper.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormFieldDictMapper.java
index 2b3303527..03298c631 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormFieldDictMapper.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormFieldDictMapper.java
@@ -1,8 +1,8 @@
-package com.dromara.md.form.mybatis.mapper;
+package org.dromara.md.form.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dromara.md.form.api.dto.DictCodesDTO;
-import com.dromara.md.form.mybatis.entity.FormFieldDict;
+import org.dromara.md.form.api.dto.DictCodesDTO;
+import org.dromara.md.form.mybatis.entity.FormFieldDict;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormMapper.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormMapper.java
similarity index 70%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormMapper.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormMapper.java
index 390552f04..2f243d47e 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormMapper.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormMapper.java
@@ -1,7 +1,7 @@
-package com.dromara.md.form.mybatis.mapper;
+package org.dromara.md.form.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dromara.md.form.mybatis.entity.Form;
+import org.dromara.md.form.mybatis.entity.Form;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormPrintConfigMapper.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormPrintConfigMapper.java
similarity index 71%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormPrintConfigMapper.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormPrintConfigMapper.java
index d4fafa094..bef41669a 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormPrintConfigMapper.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormPrintConfigMapper.java
@@ -1,7 +1,7 @@
-package com.dromara.md.form.mybatis.mapper;
+package org.dromara.md.form.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dromara.md.form.mybatis.entity.FormPrintConfig;
+import org.dromara.md.form.mybatis.entity.FormPrintConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormTemplateFieldMapper.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormTemplateFieldMapper.java
similarity index 70%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormTemplateFieldMapper.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormTemplateFieldMapper.java
index ed139a3ce..1b3e81e21 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormTemplateFieldMapper.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormTemplateFieldMapper.java
@@ -1,7 +1,7 @@
-package com.dromara.md.form.mybatis.mapper;
+package org.dromara.md.form.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dromara.md.form.mybatis.entity.FormTemplateField;
+import org.dromara.md.form.mybatis.entity.FormTemplateField;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormTemplateMapper.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormTemplateMapper.java
similarity index 70%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormTemplateMapper.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormTemplateMapper.java
index 93600fed3..87af896c3 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormTemplateMapper.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/FormTemplateMapper.java
@@ -1,7 +1,7 @@
-package com.dromara.md.form.mybatis.mapper;
+package org.dromara.md.form.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dromara.md.form.mybatis.entity.FormTemplate;
+import org.dromara.md.form.mybatis.entity.FormTemplate;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/ModifyLogRecordMapper.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/ModifyLogRecordMapper.java
similarity index 71%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/ModifyLogRecordMapper.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/ModifyLogRecordMapper.java
index 0853a0131..e8cb94138 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/ModifyLogRecordMapper.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/ModifyLogRecordMapper.java
@@ -1,7 +1,7 @@
-package com.dromara.md.form.mybatis.mapper;
+package org.dromara.md.form.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dromara.md.form.mybatis.entity.ModifyLogRecord;
+import org.dromara.md.form.mybatis.entity.ModifyLogRecord;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/TenantInitStatusMapper.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/TenantInitStatusMapper.java
similarity index 71%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/TenantInitStatusMapper.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/TenantInitStatusMapper.java
index 20c341662..1faaf16f2 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/TenantInitStatusMapper.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/org/dromara/md/form/mybatis/mapper/TenantInitStatusMapper.java
@@ -1,7 +1,7 @@
-package com.dromara.md.form.mybatis.mapper;
+package org.dromara.md.form.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dromara.md.form.mybatis.entity.TenantInitStatus;
+import org.dromara.md.form.mybatis.entity.TenantInitStatus;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormDictMapper.xml b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormDictMapper.xml
index 18d5538d2..b90ee0a08 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormDictMapper.xml
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormDictMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dromara.md.form.mybatis.mapper.FormDictMapper">
-    <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormDict">
+<mapper namespace="org.dromara.md.form.mybatis.mapper.FormDictMapper">
+    <resultMap id="BaseResultMap" type="org.dromara.md.form.mybatis.entity.FormDict">
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="code" jdbcType="VARCHAR" property="code"/>
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormFieldDictMapper.xml b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormFieldDictMapper.xml
index 29559a473..6921a8000 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormFieldDictMapper.xml
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormFieldDictMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dromara.md.form.mybatis.mapper.FormFieldDictMapper">
-    <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormFieldDict">
+<mapper namespace="org.dromara.md.form.mybatis.mapper.FormFieldDictMapper">
+    <resultMap id="BaseResultMap" type="org.dromara.md.form.mybatis.entity.FormFieldDict">
         <!--
           WARNING - @mbg.generated
           This element is automatically generated by MyBatis Generator, do not modify.
@@ -20,7 +20,7 @@
         <result column="deleted" jdbcType="TINYINT" property="deleted"/>
     </resultMap>
     <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs"
-               type="com.dromara.md.form.mybatis.entity.FormFieldDict">
+               type="org.dromara.md.form.mybatis.entity.FormFieldDict">
         <result column="other_fields" jdbcType="LONGVARCHAR" property="otherFields"/>
     </resultMap>
     <sql id="Base_Column_List">
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormMapper.xml b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormMapper.xml
index d403942ca..f157337e0 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormMapper.xml
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dromara.md.form.mybatis.mapper.FormMapper">
-    <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.Form">
+<mapper namespace="org.dromara.md.form.mybatis.mapper.FormMapper">
+    <resultMap id="BaseResultMap" type="org.dromara.md.form.mybatis.entity.Form">
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="code" jdbcType="VARCHAR" property="code"/>
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormPrintConfigMapper.xml b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormPrintConfigMapper.xml
index 4487b4aad..917c637a7 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormPrintConfigMapper.xml
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormPrintConfigMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dromara.md.form.mybatis.mapper.FormPrintConfigMapper">
-  <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormPrintConfig">
+<mapper namespace="org.dromara.md.form.mybatis.mapper.FormPrintConfigMapper">
+  <resultMap id="BaseResultMap" type="org.dromara.md.form.mybatis.entity.FormPrintConfig">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -29,7 +29,7 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.dromara.md.form.mybatis.entity.FormPrintConfig">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="org.dromara.md.form.mybatis.entity.FormPrintConfig">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormTemplateFieldMapper.xml b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormTemplateFieldMapper.xml
index c18e0ccab..7261c15f5 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormTemplateFieldMapper.xml
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormTemplateFieldMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dromara.md.form.mybatis.mapper.FormTemplateFieldMapper">
-  <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormTemplateField">
+<mapper namespace="org.dromara.md.form.mybatis.mapper.FormTemplateFieldMapper">
+  <resultMap id="BaseResultMap" type="org.dromara.md.form.mybatis.entity.FormTemplateField">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -32,7 +32,7 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.dromara.md.form.mybatis.entity.FormTemplateField">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="org.dromara.md.form.mybatis.entity.FormTemplateField">
     <result column="ext" jdbcType="LONGVARCHAR" property="ext" />
   </resultMap>
   <sql id="Base_Column_List">
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormTemplateMapper.xml b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormTemplateMapper.xml
index a4afce564..186a342d9 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormTemplateMapper.xml
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormTemplateMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dromara.md.form.mybatis.mapper.FormTemplateMapper">
-  <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormTemplate">
+<mapper namespace="org.dromara.md.form.mybatis.mapper.FormTemplateMapper">
+  <resultMap id="BaseResultMap" type="org.dromara.md.form.mybatis.entity.FormTemplate">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/ModifyLogRecordMapper.xml b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/ModifyLogRecordMapper.xml
index 2b508ba36..980a18e0f 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/ModifyLogRecordMapper.xml
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/ModifyLogRecordMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dromara.md.form.mybatis.mapper.ModifyLogRecordMapper">
-  <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.ModifyLogRecord">
+<mapper namespace="org.dromara.md.form.mybatis.mapper.ModifyLogRecordMapper">
+  <resultMap id="BaseResultMap" type="org.dromara.md.form.mybatis.entity.ModifyLogRecord">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/TenantInitStatusMapper.xml b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/TenantInitStatusMapper.xml
index 775071120..9bed56f0e 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/TenantInitStatusMapper.xml
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/TenantInitStatusMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dromara.md.form.mybatis.mapper.TenantInitStatusMapper">
-  <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.TenantInitStatus">
+<mapper namespace="org.dromara.md.form.mybatis.mapper.TenantInitStatusMapper">
+  <resultMap id="BaseResultMap" type="org.dromara.md.form.mybatis.entity.TenantInitStatus">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormController.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormController.java
similarity index 87%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormController.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormController.java
index 526f7ff89..27ee19a43 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormController.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormController.java
@@ -1,14 +1,14 @@
-package com.dromara.md.form.controller;
+package org.dromara.md.form.controller;
 
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.mybatis.entity.Form;
-import com.dromara.md.form.mybatis.entity.FormTemplate;
-import com.dromara.md.form.mybatis.entity.FormTemplateField;
-import com.dromara.md.form.service.FormService;
-import com.dromara.md.form.service.FormTemplateFieldService;
-import com.dromara.md.form.service.FormTemplateService;
-import com.dromara.md.form.service.TenantInitializationService;
-import com.dromara.md.form.utils.TenantHelper;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.mybatis.entity.Form;
+import org.dromara.md.form.mybatis.entity.FormTemplate;
+import org.dromara.md.form.mybatis.entity.FormTemplateField;
+import org.dromara.md.form.service.FormService;
+import org.dromara.md.form.service.FormTemplateFieldService;
+import org.dromara.md.form.service.FormTemplateService;
+import org.dromara.md.form.service.TenantInitializationService;
+import org.dromara.md.form.utils.TenantHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormDictController.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormDictController.java
similarity index 90%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormDictController.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormDictController.java
index 74e35fa94..7cdaaea23 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormDictController.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormDictController.java
@@ -1,14 +1,14 @@
-package com.dromara.md.form.controller;
+package org.dromara.md.form.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.dto.FormDictDTO;
-import com.dromara.md.form.api.dto.FormDictImportDTO;
-import com.dromara.md.form.api.vo.FormDictVO;
-import com.dromara.md.form.mybatis.entity.FormDict;
-import com.dromara.md.form.service.FormDictService;
-import com.dromara.md.form.service.FormFieldDictService;
-import com.dromara.md.form.service.TenantInitializationService;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.dto.FormDictDTO;
+import org.dromara.md.form.api.dto.FormDictImportDTO;
+import org.dromara.md.form.api.vo.FormDictVO;
+import org.dromara.md.form.mybatis.entity.FormDict;
+import org.dromara.md.form.service.FormDictService;
+import org.dromara.md.form.service.FormFieldDictService;
+import org.dromara.md.form.service.TenantInitializationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormFieldDictController.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormFieldDictController.java
similarity index 90%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormFieldDictController.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormFieldDictController.java
index e4fb2d8ba..584b20fbc 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormFieldDictController.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormFieldDictController.java
@@ -1,15 +1,15 @@
-package com.dromara.md.form.controller;
+package org.dromara.md.form.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.constant.FormFieldDictType;
-import com.dromara.md.form.api.dto.FormFieldDictDTO;
-import com.dromara.md.form.api.dto.FormFieldDictQ;
-import com.dromara.md.form.api.vo.FormFieldDictVO;
-import com.dromara.md.form.mybatis.entity.FormFieldDict;
-import com.dromara.md.form.service.FormDictService;
-import com.dromara.md.form.service.FormFieldDictService;
-import com.dromara.md.form.utils.TenantHelper;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.constant.FormFieldDictType;
+import org.dromara.md.form.api.dto.FormFieldDictDTO;
+import org.dromara.md.form.api.dto.FormFieldDictQ;
+import org.dromara.md.form.api.vo.FormFieldDictVO;
+import org.dromara.md.form.mybatis.entity.FormFieldDict;
+import org.dromara.md.form.service.FormDictService;
+import org.dromara.md.form.service.FormFieldDictService;
+import org.dromara.md.form.utils.TenantHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormPrintConfigController.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormPrintConfigController.java
similarity index 82%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormPrintConfigController.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormPrintConfigController.java
index 106f57495..ffcfbda84 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormPrintConfigController.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormPrintConfigController.java
@@ -1,13 +1,13 @@
-package com.dromara.md.form.controller;
+package org.dromara.md.form.controller;
 
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.dto.FormPrintConfigDTO;
-import com.dromara.md.form.api.dto.FormPrintConfigModeDTO;
-import com.dromara.md.form.api.dto.FormPrintConfigUploadDTO;
-import com.dromara.md.form.api.dto.FormPrintDTO;
-import com.dromara.md.form.api.vo.FormPrintConfigVO;
-import com.dromara.md.form.mybatis.entity.FormPrintConfig;
-import com.dromara.md.form.service.FormPrintConfigService;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.dto.FormPrintConfigDTO;
+import org.dromara.md.form.api.dto.FormPrintConfigModeDTO;
+import org.dromara.md.form.api.dto.FormPrintConfigUploadDTO;
+import org.dromara.md.form.api.dto.FormPrintDTO;
+import org.dromara.md.form.api.vo.FormPrintConfigVO;
+import org.dromara.md.form.mybatis.entity.FormPrintConfig;
+import org.dromara.md.form.service.FormPrintConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.dromara.common.oss.entity.UploadResult;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormTemplateController.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormTemplateController.java
similarity index 91%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormTemplateController.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormTemplateController.java
index 1f1fcba9b..10cd5f720 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormTemplateController.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormTemplateController.java
@@ -1,9 +1,9 @@
-package com.dromara.md.form.controller;
+package org.dromara.md.form.controller;
 
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.dto.FormTemplateDTO;
-import com.dromara.md.form.api.vo.FormTemplateVO;
-import com.dromara.md.form.service.FormTemplateService;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.dto.FormTemplateDTO;
+import org.dromara.md.form.api.vo.FormTemplateVO;
+import org.dromara.md.form.service.FormTemplateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormTemplateFieldController.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormTemplateFieldController.java
similarity index 89%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormTemplateFieldController.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormTemplateFieldController.java
index d13f13ba4..ec3bdadfe 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormTemplateFieldController.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/FormTemplateFieldController.java
@@ -1,8 +1,8 @@
-package com.dromara.md.form.controller;
+package org.dromara.md.form.controller;
 
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.mybatis.entity.FormTemplateField;
-import com.dromara.md.form.service.FormTemplateFieldService;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.mybatis.entity.FormTemplateField;
+import org.dromara.md.form.service.FormTemplateFieldService;
 
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/ModifyLogRecordController.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/ModifyLogRecordController.java
similarity index 87%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/ModifyLogRecordController.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/ModifyLogRecordController.java
index dcac7e167..78301520a 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/ModifyLogRecordController.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/ModifyLogRecordController.java
@@ -1,10 +1,10 @@
-package com.dromara.md.form.controller;
+package org.dromara.md.form.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.dto.ModifyLogRecordDTO;
-import com.dromara.md.form.mybatis.entity.ModifyLogRecord;
-import com.dromara.md.form.service.ModifyLogRecordService;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.dto.ModifyLogRecordDTO;
+import org.dromara.md.form.mybatis.entity.ModifyLogRecord;
+import org.dromara.md.form.service.ModifyLogRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/SysFormDictController.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/SysFormDictController.java
similarity index 89%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/SysFormDictController.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/SysFormDictController.java
index f3006f378..36fd69e7b 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/SysFormDictController.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/SysFormDictController.java
@@ -1,11 +1,11 @@
-package com.dromara.md.form.controller;
+package org.dromara.md.form.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.dto.FormDictDTO;
-import com.dromara.md.form.mybatis.entity.FormDict;
-import com.dromara.md.form.service.FormDictService;
-import com.dromara.md.form.utils.TenantHelper;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.dto.FormDictDTO;
+import org.dromara.md.form.mybatis.entity.FormDict;
+import org.dromara.md.form.service.FormDictService;
+import org.dromara.md.form.utils.TenantHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/SysFormFieldDictController.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/SysFormFieldDictController.java
similarity index 91%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/SysFormFieldDictController.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/SysFormFieldDictController.java
index c9e1d1b8a..66a8c7a7b 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/SysFormFieldDictController.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/SysFormFieldDictController.java
@@ -1,14 +1,14 @@
-package com.dromara.md.form.controller;
+package org.dromara.md.form.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.dto.FormFieldDictDTO;
-import com.dromara.md.form.api.dto.FormFieldDictQ;
-import com.dromara.md.form.api.vo.FormFieldDictDifyVo;
-import com.dromara.md.form.api.vo.FormFieldDictVO;
-import com.dromara.md.form.mybatis.entity.FormFieldDict;
-import com.dromara.md.form.service.FormFieldDictService;
-import com.dromara.md.form.utils.TenantHelper;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.dto.FormFieldDictDTO;
+import org.dromara.md.form.api.dto.FormFieldDictQ;
+import org.dromara.md.form.api.vo.FormFieldDictDifyVo;
+import org.dromara.md.form.api.vo.FormFieldDictVO;
+import org.dromara.md.form.mybatis.entity.FormFieldDict;
+import org.dromara.md.form.service.FormFieldDictService;
+import org.dromara.md.form.utils.TenantHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/FormFieldDictFeignController.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/FormFieldDictFeignController.java
similarity index 89%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/FormFieldDictFeignController.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/FormFieldDictFeignController.java
index 824ce1cd6..68810cb2b 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/FormFieldDictFeignController.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/FormFieldDictFeignController.java
@@ -1,14 +1,14 @@
-package com.dromara.md.form.controller.feign;
+package org.dromara.md.form.controller.feign;
 
 import cn.hutool.core.collection.CollUtil;
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.dto.FormFieldDictQ;
-import com.dromara.md.form.api.vo.FormFieldDictDifyVo;
-import com.dromara.md.form.api.vo.FormFieldDictVO;
-import com.dromara.md.form.feign.FormFieldDictFeignClient;
-import com.dromara.md.form.service.FormDictService;
-import com.dromara.md.form.service.FormFieldDictService;
-import com.dromara.md.form.utils.TenantHelper;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.dto.FormFieldDictQ;
+import org.dromara.md.form.api.vo.FormFieldDictDifyVo;
+import org.dromara.md.form.api.vo.FormFieldDictVO;
+import org.dromara.md.form.feign.FormFieldDictFeignClient;
+import org.dromara.md.form.service.FormDictService;
+import org.dromara.md.form.service.FormFieldDictService;
+import org.dromara.md.form.utils.TenantHelper;
 import jodd.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/FormPrintConfigFeignController.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/FormPrintConfigFeignController.java
similarity index 74%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/FormPrintConfigFeignController.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/FormPrintConfigFeignController.java
index cc2cc26d2..1ed5b2413 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/FormPrintConfigFeignController.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/FormPrintConfigFeignController.java
@@ -1,10 +1,10 @@
-package com.dromara.md.form.controller.feign;
+package org.dromara.md.form.controller.feign;
 
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.vo.FormPrintConfigVO;
-import com.dromara.md.form.feign.FormPrintConfigFeignClient;
-import com.dromara.md.form.service.FormPrintConfigService;
-import com.dromara.md.form.utils.TenantHelper;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.vo.FormPrintConfigVO;
+import org.dromara.md.form.feign.FormPrintConfigFeignClient;
+import org.dromara.md.form.service.FormPrintConfigService;
+import org.dromara.md.form.utils.TenantHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/FormTemplateFeignController.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/FormTemplateFeignController.java
similarity index 83%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/FormTemplateFeignController.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/FormTemplateFeignController.java
index f6f8161a7..34155263f 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/FormTemplateFeignController.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/FormTemplateFeignController.java
@@ -1,10 +1,10 @@
-package com.dromara.md.form.controller.feign;
+package org.dromara.md.form.controller.feign;
 
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.vo.FormTemplateVO;
-import com.dromara.md.form.feign.FormTemplateFeignClient;
-import com.dromara.md.form.utils.TenantHelper;
-import com.dromara.md.form.service.FormTemplateService;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.vo.FormTemplateVO;
+import org.dromara.md.form.feign.FormTemplateFeignClient;
+import org.dromara.md.form.utils.TenantHelper;
+import org.dromara.md.form.service.FormTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/ModifyLogRecordFeignController.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/ModifyLogRecordFeignController.java
similarity index 70%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/ModifyLogRecordFeignController.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/ModifyLogRecordFeignController.java
index 5059033c7..d37c67539 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/ModifyLogRecordFeignController.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/ModifyLogRecordFeignController.java
@@ -1,10 +1,10 @@
-package com.dromara.md.form.controller.feign;
+package org.dromara.md.form.controller.feign;
 
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.dto.ModifyLogRecordDTO;
-import com.dromara.md.form.feign.ModifyLogRecordFeignClient;
-import com.dromara.md.form.service.ModifyLogRecordService;
-import com.dromara.md.form.utils.TenantHelper;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.dto.ModifyLogRecordDTO;
+import org.dromara.md.form.feign.ModifyLogRecordFeignClient;
+import org.dromara.md.form.service.ModifyLogRecordService;
+import org.dromara.md.form.utils.TenantHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/SystemDictFeignController.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/SystemDictFeignController.java
similarity index 72%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/SystemDictFeignController.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/SystemDictFeignController.java
index 449d282da..cc8689a39 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/SystemDictFeignController.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/controller/feign/SystemDictFeignController.java
@@ -1,11 +1,11 @@
-package com.dromara.md.form.controller.feign;
+package org.dromara.md.form.controller.feign;
 
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.api.dto.FormFieldDictQ;
-import com.dromara.md.form.api.vo.FormFieldDictVO;
-import com.dromara.md.form.feign.SystemDictFeignClient;
-import com.dromara.md.form.service.FormFieldDictService;
-import com.dromara.md.form.utils.TenantHelper;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.api.dto.FormFieldDictQ;
+import org.dromara.md.form.api.vo.FormFieldDictVO;
+import org.dromara.md.form.feign.SystemDictFeignClient;
+import org.dromara.md.form.service.FormFieldDictService;
+import org.dromara.md.form.utils.TenantHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormDictService.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormDictService.java
similarity index 96%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormDictService.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormDictService.java
index c3908576f..2ef3953df 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormDictService.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormDictService.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.service;
+package org.dromara.md.form.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dromara.md.form.api.dto.FormDictDTO;
-import com.dromara.md.form.api.dto.FormDictImportDTO;
-import com.dromara.md.form.api.dto.FormFieldDictImportDTO;
-import com.dromara.md.form.api.dto.FormFieldDictQ;
-import com.dromara.md.form.api.vo.FormDictVO;
-import com.dromara.md.form.api.vo.FormFieldDictVO;
-import com.dromara.md.form.mybatis.entity.FormDict;
-import com.dromara.md.form.mybatis.mapper.FormDictMapper;
+import org.dromara.md.form.api.dto.FormDictDTO;
+import org.dromara.md.form.api.dto.FormDictImportDTO;
+import org.dromara.md.form.api.dto.FormFieldDictImportDTO;
+import org.dromara.md.form.api.dto.FormFieldDictQ;
+import org.dromara.md.form.api.vo.FormDictVO;
+import org.dromara.md.form.api.vo.FormFieldDictVO;
+import org.dromara.md.form.mybatis.entity.FormDict;
+import org.dromara.md.form.mybatis.mapper.FormDictMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.tenant.helper.LoginHelper;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormFieldDictService.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormFieldDictService.java
similarity index 97%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormFieldDictService.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormFieldDictService.java
index 0b792081e..0a40e16a6 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormFieldDictService.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormFieldDictService.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.service;
+package org.dromara.md.form.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -7,15 +7,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dromara.md.form.api.constant.FormFieldDictType;
-import com.dromara.md.form.api.dto.DictCodesDTO;
-import com.dromara.md.form.api.dto.FormFieldDictDTO;
-import com.dromara.md.form.api.dto.FormFieldDictImportDTO;
-import com.dromara.md.form.api.dto.FormFieldDictQ;
-import com.dromara.md.form.api.vo.FormFieldDictDifyVo;
-import com.dromara.md.form.api.vo.FormFieldDictVO;
-import com.dromara.md.form.mybatis.entity.FormFieldDict;
-import com.dromara.md.form.mybatis.mapper.FormFieldDictMapper;
+import org.dromara.md.form.api.constant.FormFieldDictType;
+import org.dromara.md.form.api.dto.DictCodesDTO;
+import org.dromara.md.form.api.dto.FormFieldDictDTO;
+import org.dromara.md.form.api.dto.FormFieldDictImportDTO;
+import org.dromara.md.form.api.dto.FormFieldDictQ;
+import org.dromara.md.form.api.vo.FormFieldDictDifyVo;
+import org.dromara.md.form.api.vo.FormFieldDictVO;
+import org.dromara.md.form.mybatis.entity.FormFieldDict;
+import org.dromara.md.form.mybatis.mapper.FormFieldDictMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.json.utils.JsonUtils;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormPrintConfigService.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormPrintConfigService.java
similarity index 93%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormPrintConfigService.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormPrintConfigService.java
index 52becf657..26732ca57 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormPrintConfigService.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormPrintConfigService.java
@@ -1,16 +1,16 @@
-package com.dromara.md.form.service;
+package org.dromara.md.form.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dromara.md.form.api.dto.FormPrintConfigDTO;
-import com.dromara.md.form.api.dto.FormPrintConfigModeDTO;
-import com.dromara.md.form.api.dto.FormPrintConfigUploadDTO;
-import com.dromara.md.form.api.dto.FormPrintDTO;
-import com.dromara.md.form.api.vo.FormPrintConfigVO;
-import com.dromara.md.form.mybatis.entity.Form;
-import com.dromara.md.form.mybatis.entity.FormPrintConfig;
-import com.dromara.md.form.mybatis.mapper.FormPrintConfigMapper;
+import org.dromara.md.form.api.dto.FormPrintConfigDTO;
+import org.dromara.md.form.api.dto.FormPrintConfigModeDTO;
+import org.dromara.md.form.api.dto.FormPrintConfigUploadDTO;
+import org.dromara.md.form.api.dto.FormPrintDTO;
+import org.dromara.md.form.api.vo.FormPrintConfigVO;
+import org.dromara.md.form.mybatis.entity.Form;
+import org.dromara.md.form.mybatis.entity.FormPrintConfig;
+import org.dromara.md.form.mybatis.mapper.FormPrintConfigMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.StringUtils;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormService.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormService.java
similarity index 96%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormService.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormService.java
index 3f71fea07..965cbbf12 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormService.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormService.java
@@ -1,8 +1,8 @@
-package com.dromara.md.form.service;
+package org.dromara.md.form.service;
 
 import cn.hutool.core.util.StrUtil;
-import com.dromara.md.form.mybatis.entity.Form;
-import com.dromara.md.form.mybatis.mapper.FormMapper;
+import org.dromara.md.form.mybatis.entity.Form;
+import org.dromara.md.form.mybatis.mapper.FormMapper;
 import org.dromara.common.core.exception.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormTemplateFieldService.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormTemplateFieldService.java
similarity index 96%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormTemplateFieldService.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormTemplateFieldService.java
index 4d5d8e819..2ae3d42cb 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormTemplateFieldService.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormTemplateFieldService.java
@@ -1,14 +1,14 @@
-package com.dromara.md.form.service;
+package org.dromara.md.form.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dromara.md.form.api.constant.FormTemplateFieldType;
-import com.dromara.md.form.api.dto.FormTemplateDTO;
-import com.dromara.md.form.mybatis.entity.FormTemplateField;
-import com.dromara.md.form.mybatis.mapper.FormTemplateFieldMapper;
+import org.dromara.md.form.api.constant.FormTemplateFieldType;
+import org.dromara.md.form.api.dto.FormTemplateDTO;
+import org.dromara.md.form.mybatis.entity.FormTemplateField;
+import org.dromara.md.form.mybatis.mapper.FormTemplateFieldMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.tenant.helper.LoginHelper;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormTemplateService.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormTemplateService.java
similarity index 97%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormTemplateService.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormTemplateService.java
index 223bcbe22..31dee72ef 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormTemplateService.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/FormTemplateService.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.service;
+package org.dromara.md.form.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -6,12 +6,12 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.EncryptUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dromara.md.form.api.dto.FormTemplateDTO;
-import com.dromara.md.form.api.vo.FormTemplateVO;
-import com.dromara.md.form.mybatis.entity.Form;
-import com.dromara.md.form.mybatis.entity.FormTemplate;
-import com.dromara.md.form.mybatis.entity.FormTemplateField;
-import com.dromara.md.form.mybatis.mapper.FormTemplateMapper;
+import org.dromara.md.form.api.dto.FormTemplateDTO;
+import org.dromara.md.form.api.vo.FormTemplateVO;
+import org.dromara.md.form.mybatis.entity.Form;
+import org.dromara.md.form.mybatis.entity.FormTemplate;
+import org.dromara.md.form.mybatis.entity.FormTemplateField;
+import org.dromara.md.form.mybatis.mapper.FormTemplateMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.json.utils.JsonUtils;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/ModifyLogRecordService.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/ModifyLogRecordService.java
similarity index 93%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/ModifyLogRecordService.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/ModifyLogRecordService.java
index b26658b0d..54e228c53 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/ModifyLogRecordService.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/ModifyLogRecordService.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.service;
+package org.dromara.md.form.service;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dromara.md.form.api.dto.ModifyLogRecordDTO;
-import com.dromara.md.form.mybatis.entity.ModifyLogRecord;
-import com.dromara.md.form.mybatis.mapper.ModifyLogRecordMapper;
+import org.dromara.md.form.api.dto.ModifyLogRecordDTO;
+import org.dromara.md.form.mybatis.entity.ModifyLogRecord;
+import org.dromara.md.form.mybatis.mapper.ModifyLogRecordMapper;
 import org.dromara.common.core.exception.ServiceException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/TenantInitStatusService.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/TenantInitStatusService.java
similarity index 92%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/TenantInitStatusService.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/TenantInitStatusService.java
index 80427ede3..43e65886f 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/TenantInitStatusService.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/TenantInitStatusService.java
@@ -1,9 +1,9 @@
-package com.dromara.md.form.service;
+package org.dromara.md.form.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dromara.md.form.mybatis.entity.TenantInitStatus;
-import com.dromara.md.form.mybatis.mapper.TenantInitStatusMapper;
+import org.dromara.md.form.mybatis.entity.TenantInitStatus;
+import org.dromara.md.form.mybatis.mapper.TenantInitStatusMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/TenantInitializationService.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/TenantInitializationService.java
similarity index 95%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/TenantInitializationService.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/TenantInitializationService.java
index 7a8b7353c..28ccf4904 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/TenantInitializationService.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/service/TenantInitializationService.java
@@ -1,12 +1,12 @@
-package com.dromara.md.form.service;
+package org.dromara.md.form.service;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.mybatis.entity.Form;
-import com.dromara.md.form.mybatis.entity.FormDict;
-import com.dromara.md.form.mybatis.entity.FormTemplate;
-import com.dromara.md.form.mybatis.entity.FormTemplateField;
-import com.dromara.md.form.utils.TenantHelper;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.mybatis.entity.Form;
+import org.dromara.md.form.mybatis.entity.FormDict;
+import org.dromara.md.form.mybatis.entity.FormTemplate;
+import org.dromara.md.form.mybatis.entity.FormTemplateField;
+import org.dromara.md.form.utils.TenantHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/TenantHelper.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/utils/TenantHelper.java
similarity index 99%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/TenantHelper.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/utils/TenantHelper.java
index c97643fee..70035ecbb 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/TenantHelper.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/utils/TenantHelper.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.utils;
+package org.dromara.md.form.utils;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/poi/ExcelTemplateProcessor.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/utils/poi/ExcelTemplateProcessor.java
similarity index 99%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/poi/ExcelTemplateProcessor.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/utils/poi/ExcelTemplateProcessor.java
index f13cffad4..09d39c270 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/poi/ExcelTemplateProcessor.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/utils/poi/ExcelTemplateProcessor.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.utils.poi;
+package org.dromara.md.form.utils.poi;
 
 import org.apache.poi.poifs.crypt.HashAlgorithm;
 import org.apache.poi.xssf.usermodel.XSSFCell;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/poi/ProcessorUtils.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/utils/poi/ProcessorUtils.java
similarity index 99%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/poi/ProcessorUtils.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/utils/poi/ProcessorUtils.java
index 78d3dc182..5516ab1c4 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/poi/ProcessorUtils.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/utils/poi/ProcessorUtils.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.utils.poi;
+package org.dromara.md.form.utils.poi;
 
 import java.lang.reflect.Field;
 import java.text.ParseException;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/poi/WordTemplateProcessor.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/utils/poi/WordTemplateProcessor.java
similarity index 99%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/poi/WordTemplateProcessor.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/utils/poi/WordTemplateProcessor.java
index 5ccee61f9..7f6215d41 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/poi/WordTemplateProcessor.java
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/org/dromara/md/form/utils/poi/WordTemplateProcessor.java
@@ -1,4 +1,4 @@
-package com.dromara.md.form.utils.poi;
+package org.dromara.md.form.utils.poi;
 
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/com/dromara/md/form/AppApplication.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/org/dromara/md/form/AppApplication.java
similarity index 100%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/com/dromara/md/form/AppApplication.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/org/dromara/md/form/AppApplication.java
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/com/dromara/md/form/AppContext.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/org/dromara/md/form/AppContext.java
similarity index 100%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/com/dromara/md/form/AppContext.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/org/dromara/md/form/AppContext.java
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/com/dromara/md/form/config/BooksflowFormDataSourceConfig.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/org/dromara/md/form/config/BooksflowFormDataSourceConfig.java
similarity index 100%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/com/dromara/md/form/config/BooksflowFormDataSourceConfig.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/org/dromara/md/form/config/BooksflowFormDataSourceConfig.java
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/com/dromara/md/form/config/BooksflowFormExceptionHandler.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/org/dromara/md/form/config/BooksflowFormExceptionHandler.java
similarity index 100%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/com/dromara/md/form/config/BooksflowFormExceptionHandler.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/org/dromara/md/form/config/BooksflowFormExceptionHandler.java
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/com/dromara/md/form/config/NacosPropertyLoadConfig.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/org/dromara/md/form/config/NacosPropertyLoadConfig.java
similarity index 100%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/com/dromara/md/form/config/NacosPropertyLoadConfig.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/org/dromara/md/form/config/NacosPropertyLoadConfig.java
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/com/dromara/md/form/config/SwaggerConfig.java b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/org/dromara/md/form/config/SwaggerConfig.java
similarity index 100%
rename from ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/com/dromara/md/form/config/SwaggerConfig.java
rename to ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/org/dromara/md/form/config/SwaggerConfig.java
diff --git a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/resources/logback.xml
index f280065ca..850f8dec7 100644
--- a/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/resources/logback.xml
+++ b/ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/resources/logback.xml
@@ -134,6 +134,6 @@
 	<logger name="org.springframework.cloud.openfeign.FeignClientFactoryBean" level="ERROR"/>
 	<logger name="com.netflix.discovery.shared.resolver.aws.ConfigClusterResolver" level="WARN"/>
 
-	<logger name="com.dromara.md.form.mybatis.mapper" level="DEBUG"/>
+	<logger name="org.dromara.md.form.mybatis.mapper" level="DEBUG"/>
 
 </configuration>
diff --git a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ProjectController.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ProjectController.java
index 20d9164da..8f6d0a804 100644
--- a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ProjectController.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/H5ProjectController.java
@@ -2,8 +2,8 @@ package org.dromara.md.h5.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.utils.TenantHelper;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.utils.TenantHelper;
 import org.dromara.md.h5.api.constant.ProjectStatus;
 import org.dromara.md.h5.api.dto.H5ProjectContentDTO;
 import org.dromara.md.h5.api.dto.query.H5ProjectQueryDTO;
diff --git a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/WorkController.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/WorkController.java
index ec6eb4ccf..e7cbfd6d9 100644
--- a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/WorkController.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/controller/WorkController.java
@@ -2,8 +2,8 @@ package org.dromara.md.h5.controller;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.dromara.md.form.api.constant.BaseConstant;
-import com.dromara.md.form.utils.TenantHelper;
+import org.dromara.md.form.api.constant.BaseConstant;
+import org.dromara.md.form.utils.TenantHelper;
 import org.dromara.md.h5.api.constant.ProjectStatus;
 import org.dromara.md.h5.api.dto.H5ProjectContentDTO;
 import org.dromara.md.h5.api.dto.query.H5ProjectQueryDTO;
diff --git a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5FormServiceImpl.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5FormServiceImpl.java
index aa1bc254b..6a1668e6c 100644
--- a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5FormServiceImpl.java
+++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/src/main/java/org/dromara/md/h5/service/impl/H5FormServiceImpl.java
@@ -3,7 +3,7 @@ package org.dromara.md.h5.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dromara.md.form.service.FormService;
+import org.dromara.md.form.service.FormService;
 import org.dromara.md.h5.convert.FormSubmissionConvert;
 import org.dromara.md.h5.convert.H5FormConvert;
 import org.dromara.md.h5.mapper.mapper.FormSubmissionDao;
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/MallH5Application.java b/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/MallH5Application.java
index 2753a0c4b..8b7391cf1 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/MallH5Application.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/MallH5Application.java
@@ -10,7 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author WeiHongBin
  */
 @EnableDubbo
-@SpringBootApplication(scanBasePackages = {"com.dromara.md.form", "org.dromara"})
+@SpringBootApplication(scanBasePackages = {"org.dromara"})
 public class MallH5Application {
 
     public static void main(String[] args) {
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/PlusTenantLineHandler.java b/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/PlusTenantLineHandler.java
index 6ae7b06c7..442790337 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/PlusTenantLineHandler.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/org/dromara/h5/config/PlusTenantLineHandler.java
@@ -2,7 +2,7 @@ package org.dromara.h5.config;
 
 import cn.hutool.core.collection.ListUtil;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
-import com.dromara.md.form.utils.TenantHelper;
+import org.dromara.md.form.utils.TenantHelper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/application.yml b/ruoyi-site/ruoyi-h5/src/main/resources/application.yml
index e6070d7a0..03637c7f0 100644
--- a/ruoyi-site/ruoyi-h5/src/main/resources/application.yml
+++ b/ruoyi-site/ruoyi-h5/src/main/resources/application.yml
@@ -82,7 +82,7 @@ tenant:
 # https://baomidou.com/config/
 mybatis-plus:
   # 多包名使用 例如 org.dromara.**.mapper,org.xxx.**.mapper
-  mapperPackage: org.dromara.**.mapper,com.dromara.**.mapper
+  mapperPackage: org.dromara.**.mapper
   #  # 实体扫描，多个package用逗号或者分号分隔
   #  typeAliasesPackage: com.luban.api.entity
   global-config: