Merge remote-tracking branch 'origin/huoshan' into huoshan

# Conflicts:
#	hzims-service-api/digital-twin-display-api/pom.xml
#	hzims-service/digital-twin-display/pom.xml
#	hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/DigitalTwinDisplayApplication.java

hzims-service-api/digital-twin-display-api/pom.xml

@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>hzims-service-api</artifactId>
         <groupId>com.hnac.hzims</groupId>
+        <artifactId>hzims-service-api</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>digital-twin-display-api</artifactId>
     <packaging>jar</packaging>

hzims-service/digital-twin-display/pom.xml

@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>hzims-service</artifactId>
         <groupId>com.hnac.hzims</groupId>
+        <artifactId>hzims-service</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>digital-twin-display</artifactId>
     <packaging>jar</packaging>

hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/DigitalTwinDisplayApplication.java

@@ -9,6 +9,12 @@ import org.springframework.cloud.client.SpringCloudApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/25 8:24
+ */
 //数据孪生展示服务
 @EnableBladeFeign(basePackages = {"org.springblade","com.hnac"})
 @SpringCloudApplication