Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/cms into develop

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/config/Knife4jConfiguration.java

@@ -36,7 +36,6 @@ public class Knife4jConfiguration {
                 .title("iuav用户相关")
                 .description("swagger-bootstrap-ui-demo RESTful APIs")
                 .termsOfServiceUrl("https://iuav.mmcuav.cn/")
-                .contact("group@qq.com")
                 .version("1.0")
                 .build();
     }

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 0c074fb210695fac5fe2f75a806cdaf7bd446a6c
+  newTag: 32252ec358a399d4ac8355ae9291b29cc22ae292

pom.xml

@@ -30,12 +30,12 @@
     <dependencies>
 
         <!-- lombok 工具通过在代码编译时期动态的将注解替换为具体的代码, IDEA 需要添加 lombok 插件 -->
-<!--        <dependency>-->
-<!--            <groupId>org.projectlombok</groupId>-->
-<!--            <artifactId>lombok</artifactId>-->
-<!--            <version>1.18.20</version>-->
-<!--            <scope>provided</scope>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.20</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -73,10 +73,21 @@
 <!--            <version>${springfox.version}</version>-->
 <!--        </dependency>-->
 
+<!--        <dependency>-->
+<!--            <groupId>com.github.xiaoymin</groupId>-->
+<!--            <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>-->
+<!--            <version>4.0.0</version>-->
+<!--        </dependency>
+-->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-ui</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
-            <version>4.0.0</version>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>3.0.2</version>
         </dependency>