Merge remote-tracking branch 'origin/master'

# Conflicts: # dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java
4 months ago · 58c8a1880d
4 changed files with 4 additions and 4 deletions
--- a/dk-common/pom.xml
+++ b/dk-common/pom.xml
@ -52,7 +52,7 @@
    <packaging>pom</packaging>

    <description>
-        ruoyi-common通用模块
+        common通用模块
    </description>

 </project>
--- a/dk-gateway/pom.xml
+++ b/dk-gateway/pom.xml
@ -11,7 +11,7 @@
    <artifactId>dk-gateway</artifactId>

    <description>
-        ruoyi-gateway网关模块
+        gateway网关模块
    </description>

    <dependencies>
--- a/dk-modules/gen/pom.xml
+++ b/dk-modules/gen/pom.xml
@ -12,7 +12,7 @@
    <artifactId>gen</artifactId>

    <description>
-        ruoyi-gen代码生成
+        gen代码生成
    </description>

    <dependencies>
--- a/dk-modules/pom.xml
+++ b/dk-modules/pom.xml
@ -21,7 +21,7 @@
    <packaging>pom</packaging>

    <description>
-        ruoyi-modules业务模块
+        modules业务模块
    </description>

    <dependencies>