Merge branch 'sprint/S2' into release/S2

.drone.yml

@@ -9,7 +9,7 @@ steps:
       # 应用专案名称（需手动修改）
       backendName: demo-athenaopt_backend
       # 平台API版本号（需手动修改）
-      apiVersion: 5.2.0.1005
+      apiVersion: 5.2.0.1029
     commands:
       # 在开发根目录下执行 maven package 指令以构建运行包
       - mvn -f $backendName/pom.xml package -Dapi.version=$apiVersion -Dnexus.ip=https://repo.digiwincloud.com.cn/maven

demo-athenaopt_backend/pom.xml

@@ -32,7 +32,7 @@
         <nexus.ip>https://repo.digiwincloud.com.cn/maven</nexus.ip>
         <revision>1.1.0.0</revision>
         <spring.version>5.0.5.RELEASE</spring.version>
-        <api.version>5.2.0.1005</api.version>
+        <api.version>5.2.0.1029</api.version>
         <dwgson.version>2.8.6</dwgson.version>
         <DWQueue.version>1.05</DWQueue.version>
     </properties>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>com.digiwin.athena</groupId>
             <artifactId>athena-opt-common</artifactId>
-            <version>1.0.103-SNAPSHOT</version>
+            <version>1.0.105-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.digiwin</groupId>